cleanup, added XML escaping