calendar comments & refactor