[driver] minor refactoring