Update headers and clean up