working on test coverage and then refactoring