Beautify the output a bit

This pull request changes formatting a bit; I'm sending this separately as you may not like it, so rejecting just one commit won't reject the rest :)