fix js and cleaning