Make header cleaner