Refinement and Cleanup in the Code for the Header