Renamed methods to reflect better what they are doing