cpplint fixes for google style guide