Add winner to match and refactor