Minor code update to not pass around variables that aren't necessary to pass around.

Was just poking around, feel free to merge/not merge depending on your code style preferences.