reformat header to be less clunky