Minor changes
Fixed jshint errors