fix js and format