Refactor js

Rewriting our js to be more readable and less hacky.

Good idea, thanks!