Remove unneeded variable + reindent