refactor DriverRunner and remove master modification