slight Runner refactor