Cleaned up some of the XML and added format enumeration types.