Update jshint and adjust code.
Merge pull request #12 from ubilabs/feature/jshint

Update jshint and adjust code.