Remove unnecessary local variable, minor stylistic fixes.