- cleanup and add header