Renamed a few vars to be more descriptive.
Merge pull request #48 from jagthedrummer/jeremy/var-renaming

Renamed a few vars to be more descriptive.