--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
@@ -8,9 +8,13 @@
 
 package nl.cwi.monetdb.jdbc;
 
-import java.sql.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Arrays;
-import java.io.*;
 
 /**
  * The MonetBlob class implements the {@link java.sql.Blob} interface.  Because

--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
@@ -8,8 +8,13 @@
 
 package nl.cwi.monetdb.jdbc;
 
-import java.sql.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.sql.Clob;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 
 /**
  * The MonetClob class implements the {@link java.sql.Clob} interface.  Because

--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
@@ -8,21 +8,23 @@
 
 package nl.cwi.monetdb.jdbc;
 
-import java.sql.*;
-import javax.sql.*;
-import java.util.*;
-import java.io.*;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import javax.sql.DataSource;
+import java.util.Properties;
 import java.util.logging.Logger;
 
 /**
  * A DataSource suitable for the MonetDB database.
- * 
+ *
  * This DataSource allows retrieval of a Connection using the JNDI bean like
  * framework.  A DataSource has numerous advantages over using the DriverManager
  * to retrieve a Connection object.  Using the DataSource interface enables a
  * more transparent application where the location or database can be changed
  * without changing any application code.
- * 
+ *
  * Additionally, pooled connections can be used when using a DataSource.
  *
  * @author Fabian Groffen

--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
@@ -8,7 +8,8 @@
 
 package nl.cwi.monetdb.jdbc;
 
-import java.sql.*;
+import java.sql.SQLException;
+import java.sql.Savepoint;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

--- a/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
@@ -8,8 +8,13 @@
 
 package nl.cwi.monetdb.jdbc.types;
 
-import java.sql.*;
-import java.net.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.sql.SQLData;
+import java.sql.SQLException;
+import java.sql.SQLInput;
+import java.sql.SQLOutput;
 
 /**
  * The INET class represents the INET datatype in MonetDB.  It

--- a/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
@@ -8,8 +8,11 @@
 
 package nl.cwi.monetdb.jdbc.types;
 
-import java.sql.*;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.sql.SQLData;
+import java.sql.SQLException;
+import java.sql.SQLInput;
+import java.sql.SQLOutput;
 
 /**
  * The URL class represents the URL datatype in MonetDB.  It
@@ -27,8 +30,7 @@ public class URL implements SQLData {
 	@Override
 	public void readSQL(SQLInput stream, String typeName) throws SQLException {
 		if (typeName.compareTo("url") != 0)
-			throw new SQLException("can only use this class with 'url' type",
-					"M1M05");
+			throw new SQLException("can only use this class with 'url' type", "M1M05");
 		url = stream.readString();
 	}
 
@@ -64,6 +66,6 @@ public class URL implements SQLData {
 	}
 
 	public void setURL(java.net.URL nurl) throws Exception {
-		url = nurl.toString();	
+		url = nurl.toString();
 	}
 }