Addressed remaning jshint warnings