Renamed methods to proper style