Cleaned up XML and added trim to Xml parser