Resolve JSHint warnings
Merge pull request #137 from tlvince/refactor/jshint-warnings

Resolve JSHint warnings