reformatted to clean up tags

@mamund Please review and merge.

Just formatted .xml draft and regenerated.