remove more unneeded variables
remove uneeded parameter
fix parameter name
fix parameter name
Statements should be on separate lines
Statements should be on separate lines
Nested blocks of code should not be left empty