Indentation cleanup

Just a lot of whitespace and indentation cleanup.