Clean up CalendarController

[Closes #45]