Refactor Challenge Match results