minor cleanup in driver