Refactoring strategy