refactors a couple variables to enhance clarity and jshint passes now
Merge branch 'jshint'