Variable name & jshint cleanup