changes to headers and cleanup