tidy up basic driver