Ctrl-Shift-F'd everything to follow google style

We had inconsistency, so I tried to eliminate that