more cleanup, comments, details