Cleaned up runner