Minor refactoring on the Driver class. Also upgrading Selenium driver version to 2.37.