Modularized some of the header code.