Refactor calendar marionette work