Simplify header handling