Code review PR

This is extra nitpicky, but I'm kind of allergic to `vars` when they can be avoided.