Right-click refactoring: step II