Style fixes for C++ code