Even better printing.

Damn, you can just keep refactoring. :)