Right-click refactoring, step I