Renamed a method.
Removed some comments