Cleaner XML production
Shorter XML production