refactored and cleaned DriverHelper