Reformatted XSDs for consistency