Refactoring continuing