Formatting tweaks

Just a whole bunch of minor formatting tweaks.