Cleaned CalendarController