Reorgainzed and simplified the header.