diff --git a/src/fr/devinsy/xid/Presenter.java b/src/fr/devinsy/xid/Presenter.java
index be2ee26..89d6dc4 100644
--- a/src/fr/devinsy/xid/Presenter.java
+++ b/src/fr/devinsy/xid/Presenter.java
@@ -1,11 +1,25 @@
 package fr.devinsy.xid;
 
-import java.util.*;
-import java.io.*;
-import javax.xml.parsers.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
-import org.xml.sax.*;
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 
 /**
@@ -302,15 +316,7 @@ public class Presenter
 		{
 			IdData data = (IdData) dataCore;
 
-			String theClass;
-			if (data == null)
-			{
-				theClass = null;
-			}
-			else
-			{
-				theClass = data.getAttributes ().getAttribute ("class");
-			}
+			String theClass = data.getAttributes ().getAttribute ("class");
 
 			if ((theClass == null) ||
 				(!theClass.equals ("xid:nodisplay")))
@@ -809,7 +815,7 @@ public class Presenter
 
 
 		//
-		return (result);
+		return (result);//import javax.xml.parsers.*;
 	}