Fix memory leak from commit 4c9552e7
Remove unneeded variable.
Minor formatting fixes