Refactored runner