modify refactoring