Fix C++ style