I agree with this comment whole-heartedly.  We should set up a git commit hook or something to format the code upon commit.  I've been particularly bad in this regard trying to get things done quickly.  I like if () and brackets on the line following the control structure but that's just me.  We should start a coding standard document