Simplify holidays calculation structure