Cleanups and cosmetic changes.
Reindent, cleanups.