Removed unnecessary commented code.
Renamed some variables to some suggestive names.