style and consistency fixes
Merge pull request #1 from boegel/gcc-changes

style and consistency fixes