Fix styles to fit "Google C++ Style Guide"