little cleanup in drivers