more cleanup, comments, etc