Simplify api and bookmarklet