Refactor season selector