continued to work on refactoring