Calendar refactor