more work on refactor Browser