Lots of formatting + tweaks