Formatting, typos, etc.

The diffs should be fairly easy to read in this case. The changes shouldn't controversial.