Oddly enough, I use 4 space indentation.  Not sure what's going on with the 2 spaces in the diff.  I'll update the code style.