cleanup, dont use c++ style comments