Misc formatting tweaks