Removed commented out code
Added curly braces to if stmts
Adjusted local variables to camelcase
Adjusted parameter names to camelcase
Removed unused local variables