Refactored school calendar