Some miscellaneous reformatting

Also fix minor typo in previous commit.