Minor simplification of the XML code