Simplify runner structure