making tests pass but *needing* refactoring