Refactor Browser class