What @apetro said, whitespace changes (and style fixups in general) are okay but should be done in separate commits.  On that subject, we could just run the sources through `clang-format -style=google` once (or whatever style is preferred) and then afterwards stick with that.  The benefit is that you never have to worry about style issues again, clang-format will take care of it.