Fix bug in season regex and clean up code a bit