browser module refactoring