more cleanup, organization, comments