Refactoring how we handle creating webdriver instances