CalendarToday: Tidying up