Make fields in EventCalendar private and move to util package.