Cosmetic updates

Better formatting and increased verbosity.