Attempt to refactor the match renderer