Renamed one method and removed some commented blocks