clean up and header changes