Make driver interface code a bit more readable