Tidy up XSD formula