Refactor JS
Refactor JS