cleaning js
Merge branch 'ren'