js and comments cleanup