Lots of formatting tweaks throughout