Refactored the driver constructor for readability
Merge pull request #76 from stof/contructor_refactoring

Refactored the driver constructor for readability