No duplicates in calendar.
Minor refactoring.