Cleanup and inclusion of item content into XML