jshint suggestions from @passy