@tzcoolman, please stick to the agreed coding style guidelines:

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Conditionals

There's no point in changing back what each of us did on each pull request ;)

I will not merge this until those are fixed...