Refactor runner