Minor

And more local scoping vars.