More compliance to jshint