Lots of formatting cleanup.