Refactored the driver constructor for readability

Closes #66