XML cleanup

Aligned everything and got rid of unwanted spaces