jshinted and updated