Renamed parameters; added comments