progress towards refactor related to Matt's comments
more cleanup