Refactore calendar building and configuration