Refactoring: runner classes