made jshint conform