implement store Calendar
clean up code