diff --git a/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java b/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
index 1e7989de..31d483ac 100644
--- a/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
+++ b/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
@@ -49,22 +49,22 @@ public final class JavassistProxyFactory
 
     static
     {
-    	ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try
         {
-        	Thread.currentThread().setContextClassLoader(JavassistProxyFactory.class.getClassLoader());
-        	
-        	JavassistProxyFactory proxyFactoryFactory = new JavassistProxyFactory();
-        	proxyFactoryFactory.modifyProxyFactory();
+            Thread.currentThread().setContextClassLoader(JavassistProxyFactory.class.getClassLoader());
+
+            JavassistProxyFactory proxyFactoryFactory = new JavassistProxyFactory();
+            proxyFactoryFactory.modifyProxyFactory();
         }
         catch (Exception e)
         {
             LoggerFactory.getLogger(JavassistProxyFactory.class).error("Fatal exception during proxy generation", e);
-        	throw new RuntimeException(e);
+            throw new RuntimeException(e);
         }
         finally
         {
-        	Thread.currentThread().setContextClassLoader(contextClassLoader);
+            Thread.currentThread().setContextClassLoader(contextClassLoader);
         }
     }
 
diff --git a/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java b/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
index 81a86154..6f01cd9b 100644
--- a/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
+++ b/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
@@ -32,7 +32,7 @@ public abstract class StatementProxy implements Statement
     protected final Statement delegate;
 
     private boolean isClosed;
-    
+
     protected StatementProxy(IHikariConnectionProxy connection, Statement statement)
     {
         this.connection = connection;
@@ -44,7 +44,6 @@ public abstract class StatementProxy implements Statement
         connection.checkException(e);
     }
 
-
     // **********************************************************************
     //                 Overridden java.sql.Statement Methods
     // **********************************************************************
@@ -124,8 +123,8 @@ public abstract class StatementProxy implements Statement
         return connection;
     }
 
-	@Override
-	@SuppressWarnings("unchecked")
+    @Override
+    @SuppressWarnings("unchecked")
     public final <T> T unwrap(Class<T> iface) throws SQLException
     {
         if (iface.isInstance(delegate))
diff --git a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
index 9401e321..07ab3ae5 100644
--- a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
+++ b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
@@ -154,14 +154,14 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
      */
     public void requite(final T value)
     {
-    	if (value == null)
-    	{
-    		throw new NullPointerException("Cannot return a null value to the bag");
-    	}
+        if (value == null)
+        {
+            throw new NullPointerException("Cannot return a null value to the bag");
+        }
 
         if (value.compareAndSetState(STATE_IN_USE, STATE_NOT_IN_USE))
         {
-        	LinkedList<WeakReference<T>> list = threadList.get();
+            LinkedList<WeakReference<T>> list = threadList.get();
             if (list == null)
             {
                 list = new LinkedList<WeakReference<T>>();
@@ -200,14 +200,14 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
     {
         if (value.compareAndSetState(STATE_IN_USE, STATE_REMOVED) || value.compareAndSetState(STATE_RESERVED, STATE_REMOVED))
         {
-        	if (!sharedList.remove(value))
-        	{
-        	    throw new IllegalStateException("Attempt to remove an object from the bag that does not exist");
-        	}
+            if (!sharedList.remove(value))
+            {
+                throw new IllegalStateException("Attempt to remove an object from the bag that does not exist");
+            }
         }
         else
         {
-        	throw new IllegalStateException("Attempt to remove an object from the bag that was not borrowed or reserved");
+            throw new IllegalStateException("Attempt to remove an object from the bag that was not borrowed or reserved");
         }
     }
 
@@ -225,13 +225,13 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
         ArrayList<T> list = new ArrayList<T>(sharedList.size());
         if (state == STATE_IN_USE || state == STATE_NOT_IN_USE)
         {
-	        for (T reference : sharedList)
-	        {
-	            if (reference.getState() == state)
-	            {
-	                list.add(reference);
-	            }
-	        }
+            for (T reference : sharedList)
+            {
+                if (reference.getState() == state)
+                {
+                    list.add(reference);
+                }
+            }
         }
         return list;
     }
@@ -264,7 +264,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
         final long checkInTime = System.nanoTime();
         if (!value.compareAndSetState(STATE_RESERVED, STATE_NOT_IN_USE))
         {
-        	throw new IllegalStateException("Attempt to relinquish an object to the bag that was not reserved");
+            throw new IllegalStateException("Attempt to relinquish an object to the bag that was not reserved");
         }
 
         synchronizer.releaseShared(checkInTime);