A bit header refactoring