Refactored mehtod names