Reformat the headers too.