Cleanup and finally an XML serializer