Clean up how episode and season are calculated