Tidy the cricket model match api