C++ style modifications