S3 code to comply better with google C++ style guide