Method refactored