clean up, comments