Modify design to conform to Google C++ Style Guide