cleanup headers a bit, also use CamelCase headers