Fix C++ syntax.
Python style fixes