Tidy up and add support for html body content