diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
index 9ecc7a39e..6736e3e92 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
@@ -14,8 +14,8 @@ import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Manage the process of requesting a lease set as necessary for a client based
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
index e34cd0af2..fcf284ebf 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
@@ -13,8 +13,8 @@ import net.i2p.router.JobQueue;
 import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 class ClientTunnelPool {
     private final static Log _log = new Log(ClientTunnelPool.class);
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
index 430a26020..0c9026fd4 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
@@ -7,8 +7,8 @@ import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Periodically go through all of the tunnels assigned to this client and mark 
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
index 8a831725d..f5e85fc5e 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
@@ -8,8 +8,8 @@ import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * refill the client tunnel pool as necessary, either from the TunnelPool's free
diff --git a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
index c5fc718bf..95c9477b5 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
@@ -8,27 +8,27 @@ package net.i2p.router.tunnelmanager;
  *
  */
 
+import java.util.Date;
+
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.TunnelId;
 import net.i2p.data.RouterInfo;
+import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.data.i2np.TunnelCreateStatusMessage;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
+import net.i2p.router.MessageHistory;
+import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSettings;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.message.BuildTestMessageJob;
 import net.i2p.router.message.SendReplyMessageJob;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
-
-import java.util.Date;
+import net.i2p.util.Log;
 
 public class HandleTunnelCreateMessageJob extends JobImpl {
     private final static Log _log = new Log(HandleTunnelCreateMessageJob.class);
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
index f4cc26b8e..9e4fa9131 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
@@ -36,6 +36,7 @@ import net.i2p.data.i2np.TunnelCreateStatusMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
+import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.PeerManagerFacade;
@@ -46,16 +47,14 @@ import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.message.GarlicConfig;
 import net.i2p.router.message.GarlicMessageBuilder;
 import net.i2p.router.message.PayloadGarlicConfig;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import net.i2p.util.RandomSource;
-
 import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 
 /**
  * Request the creation of a new tunnel
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
index 47457cc32..d59954bf4 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
@@ -21,17 +21,17 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
+import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 class TestTunnelJob extends JobImpl {
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
index 330d19473..c939b023d 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
@@ -28,8 +28,8 @@ import net.i2p.router.PeerSelectionCriteria;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelSettings;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 class TunnelBuilder {
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelCreateMessageHandler.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelCreateMessageHandler.java
index 5cc4a2f8c..5a11e3a94 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelCreateMessageHandler.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelCreateMessageHandler.java
@@ -8,14 +8,13 @@ package net.i2p.router.tunnelmanager;
  *
  */
 
-import net.i2p.router.HandlerJobBuilder;
-import net.i2p.router.Job;
-
+import net.i2p.data.Hash;
+import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.TunnelCreateMessage;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.Hash;
+import net.i2p.router.HandlerJobBuilder;
+import net.i2p.router.Job;
 
 class TunnelCreateMessageHandler implements HandlerJobBuilder {
     
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelGateway.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelGateway.java
index d12af9650..1c91ed4d4 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelGateway.java
@@ -8,8 +8,8 @@ package net.i2p.router.tunnelmanager;
  *
  */
 
-import net.i2p.data.TunnelId;
 import net.i2p.data.Hash;
+import net.i2p.data.TunnelId;
 
 class TunnelGateway {
     private TunnelId _tunnel;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
index ab3313ed9..5c3805d3a 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
@@ -13,14 +13,13 @@ import net.i2p.data.TunnelId;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
+import net.i2p.router.MessageHistory;
 import net.i2p.router.ProfileManager;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-
 import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Store the data for free inbound, outbound, and client pooled tunnels, and serve
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
index da1044293..be70bd2b9 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
@@ -7,8 +7,8 @@ import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Periodically go through all of the tunnels not assigned to a client and mark 
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
index c5a0afdfa..9e82da1f3 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
@@ -1,14 +1,14 @@
 package net.i2p.router.tunnelmanager;
 
+import java.util.Iterator;
+import java.util.Set;
+
+import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
-import net.i2p.data.TunnelId;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
-
-import java.util.Set;
-import java.util.Iterator;
+import net.i2p.util.Log;
 
 /**
  * Request new tunnels to be created if insufficient free inbound tunnels or
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
index c290da8bd..3ea7c45fd 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
@@ -1,24 +1,22 @@
 package net.i2p.router.tunnelmanager;
 
-import net.i2p.util.Log;
-
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.ClientTunnelSettings;
-import net.i2p.data.TunnelId;
-import net.i2p.data.Destination;
-import net.i2p.data.DataHelper;
-import net.i2p.data.DataFormatException;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
-import java.util.Iterator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Properties;
 
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.data.TunnelId;
+import net.i2p.router.ClientTunnelSettings;
+import net.i2p.router.Router;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
+
 /**
  * Handle all of the load / store of the tunnel pool (including any contained 
  * client tunnel pools)
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
index 3160f358c..1ec202fd5 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
@@ -17,8 +17,8 @@ import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.JobQueue;
 import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
 import net.i2p.util.Clock;
+import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
 /**