Upcoming episodes now display and started to refactor code