More formatting and consistency fixes
Merge pull request #1582 from Stevoisiak/newImprovedFormatting

More formatting and consistency fixes