Minor tweaks to make variable name more appropriate and correct formatting.