more cleanup and clarifying