Right-click refactoring: step III