Removing minor var abstraction - maybe makes code easier to follow
- but really, the previous commit didn't seem to take my change, so this is another attempt at it