Make driver interface code a bit more readable
Merge pull request #140 from tklengyel/driver_interface_cleanup

Make driver interface code a bit more readable