Refactor calendar year