more updates to C++ style