More cleanup and header work