Clean setting headers up a bit