calendar render refactor - step 5.5