diff --git a/src/tap/formatter/JSONFormat.java b/src/tap/formatter/JSONFormat.java
index c15625fcff4fae81a515543080c53995756b6750..431ee9861e1586505d40cd87587ec4032bc8a759 100644
--- a/src/tap/formatter/JSONFormat.java
+++ b/src/tap/formatter/JSONFormat.java
@@ -27,9 +27,7 @@ import org.json.JSONException;
 import org.json.JSONWriter;
 
 import cds.savot.writer.SavotWriter;
-
 import adql.db.DBColumn;
-
 import tap.ServiceConnection;
 import tap.TAPException;
 import tap.TAPExecutionReport;
diff --git a/src/tap/formatter/ResultSet2JsonFormatter.java b/src/tap/formatter/ResultSet2JsonFormatter.java
index d7e47f860da0a97f689eb83d1bdf439e88a56b04..2d3561bf4203c92f0876a24fcb8abd1673624fe2 100644
--- a/src/tap/formatter/ResultSet2JsonFormatter.java
+++ b/src/tap/formatter/ResultSet2JsonFormatter.java
@@ -20,7 +20,6 @@ package tap.formatter;
  */
 
 import java.io.IOException;
-
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -31,10 +30,8 @@ import org.json.JSONWriter;
 import tap.ServiceConnection;
 import tap.TAPException;
 import tap.TAPExecutionReport;
-
 import tap.metadata.TAPColumn;
 import tap.metadata.TAPTypes;
-
 import adql.db.DBColumn;
 
 public class ResultSet2JsonFormatter extends JSONFormat<ResultSet> implements ResultSetFormatter {
diff --git a/src/tap/formatter/ResultSet2VotableFormatter.java b/src/tap/formatter/ResultSet2VotableFormatter.java
index cc841bda7d57f4635c187bde4edaffeff0b2cc2c..2452e6fe6b568b5218d661c80bb6f4c326a785a1 100644
--- a/src/tap/formatter/ResultSet2VotableFormatter.java
+++ b/src/tap/formatter/ResultSet2VotableFormatter.java
@@ -26,7 +26,6 @@ import tap.TAPException;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
-
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -34,7 +33,6 @@ import java.sql.SQLException;
 import tap.ServiceConnection;
 import tap.metadata.TAPColumn;
 import tap.metadata.TAPTypes;
-
 import adql.db.DBColumn;
 
 /**
diff --git a/src/tap/formatter/VOTableFormat.java b/src/tap/formatter/VOTableFormat.java
index e5b5625f2d281679f9e6efd6b103e8196db39070..fa3220c1d6fc3528157f166afe14be36bd8513bf 100644
--- a/src/tap/formatter/VOTableFormat.java
+++ b/src/tap/formatter/VOTableFormat.java
@@ -24,14 +24,12 @@ import java.io.IOException;
 import tap.TAPExecutionReport;
 import tap.TAPJob;
 import tap.TAPException;
-
 import uws.job.Result;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
 
 import cds.savot.writer.SavotWriter;
-
 import tap.ServiceConnection;
 import tap.metadata.TAPColumn;
 import tap.metadata.VotType;
diff --git a/src/tap/metadata/TAPMetadata.java b/src/tap/metadata/TAPMetadata.java
index 9dda1b99bbc6bae1d679ca65438c43795dcd49a3..e3c36c75c53b02b3c81ddbefbcbcb93bb6e71929 100644
--- a/src/tap/metadata/TAPMetadata.java
+++ b/src/tap/metadata/TAPMetadata.java
@@ -112,7 +112,7 @@ public class TAPMetadata implements Iterable<TAPSchema>, VOSIResource, TAPResour
 	}
 
 	public Iterator<TAPTable> getTables(){
-		return new TableIterator(this);
+		return new TAPTableIterator(this);
 	}
 
 	public boolean hasTable(String schemaName, String tableName){
@@ -155,11 +155,11 @@ public class TAPMetadata implements Iterable<TAPSchema>, VOSIResource, TAPResour
 		return nbTables;
 	}
 
-	public static class TableIterator implements Iterator<TAPTable> {
+	public static class TAPTableIterator implements Iterator<TAPTable> {
 		private Iterator<TAPSchema> it;
 		private Iterator<TAPTable> itTables;
 
-		public TableIterator(TAPMetadata tapSchema){
+		public TAPTableIterator(TAPMetadata tapSchema){
 			it = tapSchema.iterator();
 
 			if (it.hasNext())