diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
index 5fa96f372..b4952438d 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
@@ -1,11 +1,5 @@
 package net.i2p.client.streaming.impl;
 
-import net.i2p.I2PException;
-import net.i2p.client.streaming.AcceptingChannel;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-
 import java.net.SocketTimeoutException;
 import java.net.ConnectException;
 import java.io.IOException;
@@ -16,6 +10,12 @@ import java.nio.channels.Selector;
 import java.nio.channels.spi.AbstractSelectionKey;
 import java.nio.channels.spi.SelectorProvider;
 
+import net.i2p.I2PException;
+import net.i2p.client.streaming.AcceptingChannel;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+
 /**
  *  As this does not (yet) extend ServerSocketChannel it cannot be returned by StandardServerSocket.getChannel(),
  *  until we implement an I2P SocketAddress class.		
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
index 9da248bc5..bf673667c 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
@@ -1,6 +1,7 @@
 package net.i2p.client.streaming.impl;
 
 import java.net.SocketTimeoutException;
+
 import net.i2p.I2PException;
 import net.i2p.client.streaming.AcceptingChannel;
 import net.i2p.client.streaming.I2PServerSocket;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
index c8775c903..cda4deedb 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
@@ -8,10 +8,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
-import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
 /**
  * Bridge between the full streaming lib and the I2PSocket API
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 9ba9c249e..757eb37f4 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -15,12 +15,12 @@ import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
-import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
 /**
  * Centralize the coordination and multiplexing of the local client's streaming.
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
index d8ef4a2ac..5e3cecacd 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
@@ -1,7 +1,5 @@
 package net.i2p.client.streaming.impl;
 
-import net.i2p.client.streaming.I2PSocket;
-
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.nio.ByteBuffer;
@@ -16,6 +14,8 @@ import java.nio.channels.spi.SelectorProvider;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.i2p.client.streaming.I2PSocket;
+
 /**
  *  As this does not (yet) extend SocketChannel it cannot be returned by StandardSocket.getChannel(),
  *  until we implement an I2P SocketAddress class.		
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
index 04c5cbbb9..4316f59ef 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
@@ -2,6 +2,7 @@ package net.i2p.client.streaming.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.data.Destination;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
index 529db4760..549df289a 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
@@ -1,8 +1,5 @@
 package net.i2p.client.streaming.impl;
 
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketOptions;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -12,6 +9,9 @@ import java.net.SocketAddress;
 import java.net.SocketException;
 import java.nio.channels.SocketChannel;
 
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
+
 /**
  * Bridge to I2PSocket.
  *
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
index ba788a3e9..393d3daf0 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
@@ -6,12 +6,11 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.i2p.I2PAppContext;
+import static net.i2p.client.streaming.impl.I2PSocketOptionsImpl.getDouble;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer2;
 
-import static net.i2p.client.streaming.impl.I2PSocketOptionsImpl.getDouble;
-
 /**
  *  Share important TCP Control Block parameters across Connections
  *  to the same remote peer.