diff --git a/core/src/main/java/gwtupload/client/Uploader.java b/core/src/main/java/gwtupload/client/Uploader.java
index ec4fec1..4ba9175 100644
--- a/core/src/main/java/gwtupload/client/Uploader.java
+++ b/core/src/main/java/gwtupload/client/Uploader.java
@@ -19,6 +19,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
+import com.google.gwt.dom.client.AnchorElement;
 import com.google.gwt.dom.client.FormElement;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
@@ -47,12 +48,7 @@
 import com.google.gwt.xml.client.Node;
 import com.google.gwt.xml.client.NodeList;
 import com.google.gwt.xml.client.XMLParser;
-import gwtupload.client.IFileInput.FileInputType;
-import gwtupload.client.ISession.Session;
-import gwtupload.client.IUploadStatus.Status;
-import gwtupload.client.bundle.UploadCss;
-import gwtupload.client.dnd.DragAndDropFormPanel;
-import gwtupload.client.dnd.IDragAndDropFileInput;
+import com.google.gwt.xml.client.impl.DOMParseException;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62,7 +58,42 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import static gwtupload.shared.UConsts.*;
+import gwtupload.client.dnd.DragAndDropFormPanel;
+import gwtupload.client.dnd.IDragAndDropFileInput;
+import static gwtupload.shared.UConsts.ATTR_BLOBSTORE_PARAM_NAME;
+import static gwtupload.shared.UConsts.MULTI_SUFFIX;
+import static gwtupload.shared.UConsts.PARAM_BLOBKEY;
+import static gwtupload.shared.UConsts.PARAM_BLOBSTORE;
+import static gwtupload.shared.UConsts.PARAM_CANCEL;
+import static gwtupload.shared.UConsts.PARAM_FILENAME;
+import static gwtupload.shared.UConsts.PARAM_NAME;
+import static gwtupload.shared.UConsts.PARAM_REMOVE;
+import static gwtupload.shared.UConsts.PARAM_SHOW;
+import static gwtupload.shared.UConsts.TAG_BLOBSTORE;
+import static gwtupload.shared.UConsts.TAG_BLOBSTORE_NAME;
+import static gwtupload.shared.UConsts.TAG_BLOBSTORE_PARAM;
+import static gwtupload.shared.UConsts.TAG_BLOBSTORE_PATH;
+import static gwtupload.shared.UConsts.TAG_CANCELED;
+import static gwtupload.shared.UConsts.TAG_CTYPE;
+import static gwtupload.shared.UConsts.TAG_CURRENT_BYTES;
+import static gwtupload.shared.UConsts.TAG_FIELD;
+import static gwtupload.shared.UConsts.TAG_FILE;
+import static gwtupload.shared.UConsts.TAG_FINISHED;
+import static gwtupload.shared.UConsts.TAG_KEY;
+import static gwtupload.shared.UConsts.TAG_MESSAGE;
+import static gwtupload.shared.UConsts.TAG_MSG_END;
+import static gwtupload.shared.UConsts.TAG_MSG_GT;
+import static gwtupload.shared.UConsts.TAG_MSG_LT;
+import static gwtupload.shared.UConsts.TAG_MSG_START;
+import static gwtupload.shared.UConsts.TAG_NAME;
+import static gwtupload.shared.UConsts.TAG_PERCENT;
+import static gwtupload.shared.UConsts.TAG_SIZE;
+import static gwtupload.shared.UConsts.TAG_TOTAL_BYTES;
+import static gwtupload.shared.UConsts.TAG_WAIT;
+import gwtupload.client.IFileInput.FileInputType;
+import gwtupload.client.ISession.Session;
+import gwtupload.client.IUploadStatus.Status;
+import gwtupload.client.bundle.UploadCss;
 
 /**
  * <p>