another WebDriver refactor