Refactoring, using separate zero configuration driver
Refactoring, using separate zero configuration driver