Modify refactoring