+ minor cleanup
+ refactoring the Calendar class in progress