Cleanup formatting

Just cleaned up the formatting of a few files to make them easier to read.