Document header refactoring