Kenny

Refactoring JS