Cleaning up the header