Tidy up header usage

Explicity define request and response headers.