Misc cleanups to indentation, remove unnecessary calls
More random cleanups
Merge master, fix conflicts
Merge properly
Merge pull request #234 from sparkiegeek/misc-cleanups

Misc cleanups