Renamed methods and removed unneccessary code