halting work on refactoring