Minor just-in-case alteration to cleanup code
Indents now match the rest of the code. Minor bugfixes. Remove junk.
Bracket sugar.