A couple of cosmetic tweaks to the variable names