Lots of (output) whitespace-related formatting cleanup