Renamed some methods for a clearer meaning and removed others