clean up indentation and use new xsd for 1.3.1