Refactored javascript
Reworked keywords