Various formatting and consistency fixes
Merge pull request #1539 from Stevoisiak/newImprovedFormatting

Various formatting and consistency fixes