clean up and header tweak