diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/ReflectHelper.java b/src/nl/astraeus/jdbc/util/ReflectHelper.java
index c87d294..eac090f 100644
--- a/src/nl/astraeus/jdbc/util/ReflectHelper.java
+++ b/src/nl/astraeus/jdbc/util/ReflectHelper.java
@@ -1,8 +1,5 @@
 package nl.astraeus.jdbc.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 10/16/13

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/ReflectHelper.java b/src/nl/astraeus/jdbc/util/ReflectHelper.java
index c87d294..eac090f 100644
--- a/src/nl/astraeus/jdbc/util/ReflectHelper.java
+++ b/src/nl/astraeus/jdbc/util/ReflectHelper.java
@@ -1,8 +1,5 @@
 package nl.astraeus.jdbc.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 10/16/13
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
index 4238527..555b1d3 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
@@ -1,6 +1,14 @@
 package nl.astraeus.jdbc.web;
 
-import nl.astraeus.jdbc.web.page.*;
+import nl.astraeus.jdbc.web.page.JvmStats;
+import nl.astraeus.jdbc.web.page.Login;
+import nl.astraeus.jdbc.web.page.QueryDetail;
+import nl.astraeus.jdbc.web.page.QueryOverview;
+import nl.astraeus.jdbc.web.page.Resources;
+import nl.astraeus.jdbc.web.page.SettingsOverview;
+import nl.astraeus.jdbc.web.page.ShowStacktrace;
+import nl.astraeus.jdbc.web.page.TransactionDetail;
+import nl.astraeus.jdbc.web.page.TransactionOverview;
 import nl.astraeus.web.page.Page;
 import nl.astraeus.web.page.PageMapping;
 

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/ReflectHelper.java b/src/nl/astraeus/jdbc/util/ReflectHelper.java
index c87d294..eac090f 100644
--- a/src/nl/astraeus/jdbc/util/ReflectHelper.java
+++ b/src/nl/astraeus/jdbc/util/ReflectHelper.java
@@ -1,8 +1,5 @@
 package nl.astraeus.jdbc.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 10/16/13
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
index 4238527..555b1d3 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
@@ -1,6 +1,14 @@
 package nl.astraeus.jdbc.web;
 
-import nl.astraeus.jdbc.web.page.*;
+import nl.astraeus.jdbc.web.page.JvmStats;
+import nl.astraeus.jdbc.web.page.Login;
+import nl.astraeus.jdbc.web.page.QueryDetail;
+import nl.astraeus.jdbc.web.page.QueryOverview;
+import nl.astraeus.jdbc.web.page.Resources;
+import nl.astraeus.jdbc.web.page.SettingsOverview;
+import nl.astraeus.jdbc.web.page.ShowStacktrace;
+import nl.astraeus.jdbc.web.page.TransactionDetail;
+import nl.astraeus.jdbc.web.page.TransactionOverview;
 import nl.astraeus.web.page.Page;
 import nl.astraeus.web.page.PageMapping;
 
diff --git a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
index de800f9..78dced3 100644
--- a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
+++ b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc.web.model;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.SqlFormatter;
 import nl.astraeus.jdbc.util.Formatting;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * User: rnentjes
  * Date: 4/21/12

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/ReflectHelper.java b/src/nl/astraeus/jdbc/util/ReflectHelper.java
index c87d294..eac090f 100644
--- a/src/nl/astraeus/jdbc/util/ReflectHelper.java
+++ b/src/nl/astraeus/jdbc/util/ReflectHelper.java
@@ -1,8 +1,5 @@
 package nl.astraeus.jdbc.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 10/16/13
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
index 4238527..555b1d3 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
@@ -1,6 +1,14 @@
 package nl.astraeus.jdbc.web;
 
-import nl.astraeus.jdbc.web.page.*;
+import nl.astraeus.jdbc.web.page.JvmStats;
+import nl.astraeus.jdbc.web.page.Login;
+import nl.astraeus.jdbc.web.page.QueryDetail;
+import nl.astraeus.jdbc.web.page.QueryOverview;
+import nl.astraeus.jdbc.web.page.Resources;
+import nl.astraeus.jdbc.web.page.SettingsOverview;
+import nl.astraeus.jdbc.web.page.ShowStacktrace;
+import nl.astraeus.jdbc.web.page.TransactionDetail;
+import nl.astraeus.jdbc.web.page.TransactionOverview;
 import nl.astraeus.web.page.Page;
 import nl.astraeus.web.page.PageMapping;
 
diff --git a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
index de800f9..78dced3 100644
--- a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
+++ b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc.web.model;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.SqlFormatter;
 import nl.astraeus.jdbc.util.Formatting;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * User: rnentjes
  * Date: 4/21/12
diff --git a/src/nl/astraeus/jdbc/web/page/Resources.java b/src/nl/astraeus/jdbc/web/page/Resources.java
index eb1f67a..2065c73 100644
--- a/src/nl/astraeus/jdbc/web/page/Resources.java
+++ b/src/nl/astraeus/jdbc/web/page/Resources.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc.web.page;
 
-import nl.astraeus.jdbc.util.IOUtils;
-import nl.astraeus.web.page.Page;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import nl.astraeus.jdbc.util.IOUtils;
+import nl.astraeus.web.page.Page;
+
 /**
  * User: rnentjes
  * Date: 3/28/12

diff --git a/src/nl/astraeus/jdbc/CallableStatementLogger.java b/src/nl/astraeus/jdbc/CallableStatementLogger.java
index fe50fad..797c9fe 100644
--- a/src/nl/astraeus/jdbc/CallableStatementLogger.java
+++ b/src/nl/astraeus/jdbc/CallableStatementLogger.java
@@ -4,7 +4,23 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.ParameterMetaData;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
diff --git a/src/nl/astraeus/jdbc/ConnectionLogger.java b/src/nl/astraeus/jdbc/ConnectionLogger.java
index c60e8b9..ae8e3ce 100644
--- a/src/nl/astraeus/jdbc/ConnectionLogger.java
+++ b/src/nl/astraeus/jdbc/ConnectionLogger.java
@@ -1,6 +1,20 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
diff --git a/src/nl/astraeus/jdbc/SqlFormatter.java b/src/nl/astraeus/jdbc/SqlFormatter.java
index 8374013..e28810b 100644
--- a/src/nl/astraeus/jdbc/SqlFormatter.java
+++ b/src/nl/astraeus/jdbc/SqlFormatter.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/18/12
diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java
index 724fd4f..4579a8f 100644
--- a/src/nl/astraeus/jdbc/StatementLogger.java
+++ b/src/nl/astraeus/jdbc/StatementLogger.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
index 20aabf8..f29bc33 100644
--- a/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
+++ b/src/nl/astraeus/jdbc/example/JdbcStatisticsExample.java
@@ -1,6 +1,11 @@
 package nl.astraeus.jdbc.example;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/IOUtils.java b/src/nl/astraeus/jdbc/util/IOUtils.java
index ce95d9d..bea23d2 100644
--- a/src/nl/astraeus/jdbc/util/IOUtils.java
+++ b/src/nl/astraeus/jdbc/util/IOUtils.java
@@ -1,6 +1,10 @@
 package nl.astraeus.jdbc.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 
 /**
  * User: rnentjes
diff --git a/src/nl/astraeus/jdbc/util/ReflectHelper.java b/src/nl/astraeus/jdbc/util/ReflectHelper.java
index c87d294..eac090f 100644
--- a/src/nl/astraeus/jdbc/util/ReflectHelper.java
+++ b/src/nl/astraeus/jdbc/util/ReflectHelper.java
@@ -1,8 +1,5 @@
 package nl.astraeus.jdbc.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 10/16/13
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
index 4238527..555b1d3 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatsMapping.java
@@ -1,6 +1,14 @@
 package nl.astraeus.jdbc.web;
 
-import nl.astraeus.jdbc.web.page.*;
+import nl.astraeus.jdbc.web.page.JvmStats;
+import nl.astraeus.jdbc.web.page.Login;
+import nl.astraeus.jdbc.web.page.QueryDetail;
+import nl.astraeus.jdbc.web.page.QueryOverview;
+import nl.astraeus.jdbc.web.page.Resources;
+import nl.astraeus.jdbc.web.page.SettingsOverview;
+import nl.astraeus.jdbc.web.page.ShowStacktrace;
+import nl.astraeus.jdbc.web.page.TransactionDetail;
+import nl.astraeus.jdbc.web.page.TransactionOverview;
 import nl.astraeus.web.page.Page;
 import nl.astraeus.web.page.PageMapping;
 
diff --git a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
index de800f9..78dced3 100644
--- a/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
+++ b/src/nl/astraeus/jdbc/web/model/TransactionEntry.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc.web.model;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.SqlFormatter;
 import nl.astraeus.jdbc.util.Formatting;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * User: rnentjes
  * Date: 4/21/12
diff --git a/src/nl/astraeus/jdbc/web/page/Resources.java b/src/nl/astraeus/jdbc/web/page/Resources.java
index eb1f67a..2065c73 100644
--- a/src/nl/astraeus/jdbc/web/page/Resources.java
+++ b/src/nl/astraeus/jdbc/web/page/Resources.java
@@ -1,12 +1,12 @@
 package nl.astraeus.jdbc.web.page;
 
-import nl.astraeus.jdbc.util.IOUtils;
-import nl.astraeus.web.page.Page;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import nl.astraeus.jdbc.util.IOUtils;
+import nl.astraeus.web.page.Page;
+
 /**
  * User: rnentjes
  * Date: 3/28/12
diff --git a/src/nl/astraeus/jdbc/web/page/ThreadStack.java b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
index c4cf90b..c769084 100644
--- a/src/nl/astraeus/jdbc/web/page/ThreadStack.java
+++ b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
@@ -1,11 +1,11 @@
 package nl.astraeus.jdbc.web.page;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.LinkedList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * User: rnentjes
  * Date: 4/12/12