Clean up some spacing and formatting of a few files.