Improve C++ indentation style