Various cleanups in some C++ files.
Merge pull request #234 from mounirlamouri/cpp_cleanup