Code formatting
Refactored CalendarUtils - moved to the core package and included more unit testing.