Refactoring patch