Code simplification in WeeklyCalFrame