Cleanup indentation and whitespace

DO NOT MERGE UNTIL REBASED after merging #118