Refactor runner.