diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java
index 22253a09..55e33fd4 100644
--- a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java
+++ b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java
@@ -77,7 +77,7 @@ abstract class PoolBase
       initializeDataSource();
    }
 
-   public String getPoolName()
+   String getPoolName()
    {
       return poolName;
    }
@@ -88,7 +88,7 @@ abstract class PoolBase
    //                           JDBC methods
    // ***********************************************************************
 
-   public void quietlyCloseConnection(final Connection connection, final String closureReason)
+   void quietlyCloseConnection(final Connection connection, final String closureReason)
    {
       try {
          if (connection == null || connection.isClosed()) {
@@ -109,7 +109,7 @@ abstract class PoolBase
       }
    }
 
-   public boolean isConnectionAlive(final Connection connection)
+   boolean isConnectionAlive(final Connection connection)
    {
       try {
          final long validationTimeout = config.getValidationTimeout();
@@ -143,17 +143,16 @@ abstract class PoolBase
       }
    }
 
-   public DataSource getUnwrappedDataSource()
+   Throwable getLastConnectionFailure()
    {
-      return dataSource;
+      return lastConnectionFailure.getAndSet(null);
    }
 
-   public Throwable getLastConnectionFailure()
+   public DataSource getUnwrappedDataSource()
    {
-      return lastConnectionFailure.getAndSet(null);
+      return dataSource;
    }
 
-
    // ***********************************************************************
    //                         PoolEntry methods
    // ***********************************************************************
@@ -163,7 +162,7 @@ abstract class PoolBase
       return new PoolEntry(newConnection(), this);
    }
 
-   public void resetConnectionState(final Connection connection, final ProxyConnection proxyConnection, final int dirtyBits) throws SQLException
+   void resetConnectionState(final Connection connection, final ProxyConnection proxyConnection, final int dirtyBits) throws SQLException
    {
       int resetBits = 0;
 
@@ -200,9 +199,15 @@ abstract class PoolBase
       }
    }
    
+   void shutdownNetworkTimeoutExecutor()
+   {
+      if (netTimeoutExecutor != null && netTimeoutExecutor instanceof ThreadPoolExecutor) {
+         ((ThreadPoolExecutor) netTimeoutExecutor).shutdownNow();
+      }
+   }
 
    // ***********************************************************************
-   //                       PoolMediator methods
+   //                       JMX methods
    // ***********************************************************************
 
    /**
@@ -258,13 +263,6 @@ abstract class PoolBase
       }
    }
 
-   public void shutdownNetworkTimeoutExecutor()
-   {
-      if (netTimeoutExecutor != null && netTimeoutExecutor instanceof ThreadPoolExecutor) {
-         ((ThreadPoolExecutor) netTimeoutExecutor).shutdownNow();
-      }
-   }
-
    // ***********************************************************************
    //                          Private methods
    // ***********************************************************************
diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java b/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java
index aad2c3cf..291dab76 100644
--- a/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java
+++ b/src/main/java/com/zaxxer/hikari/pool/PoolEntry.java
@@ -81,12 +81,12 @@ public final class PoolEntry implements IConcurrentBagEntry
       return ProxyFactory.getProxyConnection(this, connection, openStatements, leakTask, now);
    }
 
-   public void resetConnectionState(final ProxyConnection proxyConnection, final int dirtyBits) throws SQLException
+   void resetConnectionState(final ProxyConnection proxyConnection, final int dirtyBits) throws SQLException
    {
       poolBase.resetConnectionState(connection, proxyConnection, dirtyBits);
    }
 
-   public String getPoolName()
+   String getPoolName()
    {
       return poolBase.getPoolName();
    }
@@ -96,7 +96,7 @@ public final class PoolEntry implements IConcurrentBagEntry
       return connection;
    }
 
-   public boolean isEvicted()
+   boolean isEvicted()
    {
       return evict;
    }
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
index c7778bca..3bb6ebfd 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
@@ -96,30 +96,30 @@ public abstract class ProxyConnection implements Connection
    }
 
    // ***********************************************************************
-   //                     Live Connection State accessors
+   //                     Connection State Accessors
    // ***********************************************************************
 
-   public final boolean getAutoCommitState()
+   final boolean getAutoCommitState()
    {
       return isAutoCommit;
    }
 
-   public final String getCatalogState()
+   final String getCatalogState()
    {
       return dbcatalog;
    }
 
-   public final int getTransactionIsolationState()
+   final int getTransactionIsolationState()
    {
       return transactionIsolation;
    }
 
-   public final boolean getReadOnlyState()
+   final boolean getReadOnlyState()
    {
       return isReadOnly;
    }
 
-   public final int getNetworkTimeoutState()
+   final int getNetworkTimeoutState()
    {
       return networkTimeout;
    }
@@ -129,13 +129,13 @@ public abstract class ProxyConnection implements Connection
    // ***********************************************************************
 
    /** {@inheritDoc} */
-   public final PoolEntry getPoolEntry()
+   final PoolEntry getPoolEntry()
    {
       return poolEntry;
    }
 
    /** {@inheritDoc} */
-   public final SQLException checkException(final SQLException sqle)
+   final SQLException checkException(final SQLException sqle)
    {
       String sqlState = sqle.getSQLState();
       if (sqlState != null) {
@@ -156,13 +156,13 @@ public abstract class ProxyConnection implements Connection
    }
 
    /** {@inheritDoc} */
-   public final void untrackStatement(final Statement statement)
+   final void untrackStatement(final Statement statement)
    {
       openStatements.remove(statement);
    }
 
    /** {@inheritDoc} */
-   public final void markCommitStateDirty()
+   final void markCommitStateDirty()
    {
       if (isAutoCommit) {
          lastAccess = clockSource.currentTime();         
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyLeakTask.java b/src/main/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
index ee37d952..de3059e2 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyLeakTask.java
@@ -87,7 +87,7 @@ class ProxyLeakTask implements Runnable
       LOGGER.warn("Connection leak detection triggered for connection {}, stack trace follows", connectionName, exception);
    }
 
-   public void cancel()
+   void cancel()
    {
       scheduledFuture.cancel(false);
    }
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java b/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
index 3aa1b622..63c075ae 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
@@ -39,7 +39,7 @@ public abstract class ProxyResultSet implements ResultSet
       this.delegate = resultSet;
    }
 
-   protected final SQLException checkException(SQLException e)
+   final SQLException checkException(SQLException e)
    {
       return connection.checkException(e);
    }
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java b/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
index 320dd921..307ae955 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
@@ -40,7 +40,7 @@ public abstract class ProxyStatement implements Statement
       this.delegate = statement;
    }
 
-   protected final SQLException checkException(SQLException e)
+   final SQLException checkException(SQLException e)
    {
       return connection.checkException(e);
    }
diff --git a/src/test/java/com/zaxxer/hikari/ShutdownTest.java b/src/test/java/com/zaxxer/hikari/ShutdownTest.java
index 18792c40..de90431a 100644
--- a/src/test/java/com/zaxxer/hikari/ShutdownTest.java
+++ b/src/test/java/com/zaxxer/hikari/ShutdownTest.java
@@ -291,7 +291,7 @@ public class ShutdownTest
                   Assert.fail(e.getMessage());
                }
                finally {
-                  TestElf.getPool(ds).quietlyCloseConnection(connection, "(because this is a test)");
+                  try { connection.close(); } catch (SQLException e) { e.printStackTrace(); }
                   ds.close();
                }
             };