General print statement cleanup.
Merge pull request #4973 from alefnula/print-cleanup

CLN: General print statement cleanup.