Cleaned up CalendarMonth