`modify` refactoring