Repaired last commit and provided more consistent variable names.