Remove vestigial if clause
Put curly braces on all if/while/for clauses