Adjust format of headers and body