Refactored methods