2 clean/variables

@MatthewMueller @ianstormtaylor this one depends on that last one, so we can either just merge that one or merge this one i guess, or just start with that other one and i'll clean this one up so we can merge it next.

this one just cleans up some unnecessary variables/arguments :-)