XSD tidying and formatting