Style fixes for C++