General header reformatting