Ugh, I keep using snake case.  I'll fix that us.

I though this looked cleaner, but I'm OK with using var.  I've made those changes.