refactoring CalendarDay