progress in refactoring