clean up comments and commented code