refactored away some JSHint warnings
Merge pull request #194 from mcandre/master

Refactored away some JSHint warnings