Just some trivial changes to avoid direct printing to stdout.
This will create a new commit in order to revert the existing changes.
