Fix whitespace
Cleanup
Fix XSD URL. Closes #912.