JBIDE-16661 BrowserSim: Refactoring