First bit of refactoring in CalEvent class.