Improved a couple variable names.