Code cleanup in FedoaOXML