Remove external dependencies
Make tests work in browser
Move comments