refactoring progress