Clean up

These changes generally fall into the following:

- whitespace
- comments
- alphabetizing