calendar: apply refactored common