Clean up some stuff.
Reindent rest of files.