General Clean up

Just cleaned up lines. Enforcing format, not tabs, but spaces.
Brackets on next line. Hope this doesn't distress people.