Refactor JS
Refactor JS files