removed trailing white space, re-named paramters
removed trailing white space & renamed paramters