Progress in refactoring