Organize/alphabetize headers. Remove some repeats.