More cleanup mainly dealing with source formatting
- Trying to achieve some sort of congruency with indention levels, 80 character width limit, next vs same-line open curly braces, and more (standards)