Minor refactoring of browser