clean up comments & hints