CS fixes
Rename var, _foo is rather old fashioned
More formatting and indenting
Merge pull request #145 from Seldaek/cs-fixes

CS fixes