Rearrange header format