Refactor simple browsing