ProcessXml added + code clean up