Refactor calendar marionette work more