More header edits and clean up