Optimized JS code
More optimization of the JS file