Header formatting cleanup