Cleaned up XML a bit

It matches a little closer to the event attributes.