fixup formatting, remove redundant content-type headers