Minor changes

All variables declared once, removed a redundant statement.