Progress on refactoring