removing an unnecessary local binding;
some more minor stylistic changes;