Improve JS

- Simplify
- Create getters and setters that return and set proper values