A lot of formatting cleanup.