jshint advice taken