Commented out unused parameters and variables, clarified code with parenthesis, fixed shadowed variables.
Authored by: a_abraham 2011-09-21
Parent: [r2229]
Child: [r2231]
