Add ppport and remove C++ style comments