Refactoring calendar column