Refactor to keep runner code agnostic.