Updates to remove jshint issues