cleanup headers a bit