Refactor runner further