End of the optimization of the XML
Signed-off-by: Nimbus Le Truand <nimbusletruand@gmail.com>