Refactored code
Renamed methods