Lots of formatting edits