Tidy up the driver slightly