Refactor JS
Refactor PHP