C++ style changes