Improved consistency of verbose output

Also made the code DRYer.