work on refactoring