Simplify header logic