Refactoring work completed