CalendarDay slightly simpler, more DRY