Commented and cleaned JS