Updated for jshint fixes