Refactored all runners