optimized the xml a bit