A little XML cleanup