Refactoring
Renamed methods