JSlinted and Fixed