runner refactoring