Restore google code style conformity