Formatting tweaks

Some minor polish on the output format.