Refactor season match generator.