Updated all according to Google C++ Style