Refactor class Browser