Refactored Runner setup