Cleaning up the C++ language file