more cleanup, and comments