Lots of formatting cleanup