Significant indentation and whitespace fixes
remove unnecessary code, follow conventions better