Calendar refactoring finished.