diff --git a/README.md b/README.md
index c1adfec23..8b4ba5fbe 100644
--- a/README.md
+++ b/README.md
@@ -432,10 +432,8 @@ public interface BondVOInterface {
 
     long getIssueDate();
     void setIssueDate(long issueDate);  /* time in millis */
-
     long getMaturityDate();
     void setMaturityDate(long maturityDate);  /* time in millis */
-
     double getCoupon();
     void setCoupon(double coupon);
 
diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java
index 6c2f7f0b6..1df0eac22 100644
--- a/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java
+++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java
@@ -32,7 +32,6 @@ public final class ChronicleHashErrorListeners {
      * Factories a more flexible than public static instances.
      * We can add some configuration-on-the-first-call in the future.
      */
-
     private enum LoggingErrorListener implements ChronicleHashErrorListener {
         INSTANCE;
 
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 68857d2e7..e7205ad10 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -297,7 +297,6 @@ class NodeDiscovery {
                 .of(ourAddressAndPort.getPort(),
                         toInetSocketCollection(knownHostPorts0));
 */
-
         LOG.info("Using Remote identifier=" + identifier);
         nodeDiscoveryEventListenerAtomicReference.set(null);
 
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index ec9e5e77f..7a73c9f8b 100755
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -284,7 +284,6 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable, Clon
      * @see net.openhft.chronicle.map.StatelessChronicleMap#lazyConnect(long,
      * java.net.InetSocketAddress)
      */
-
     private synchronized void attemptConnect(final InetSocketAddress remoteAddress) {
 
         // ensures that the excising connection are closed
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 69ab96e1e..c78b72017 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -276,7 +276,6 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
      *
      * @param approxTime the approximate time in milliseconds
      */
-
     void heartBeatMonitor(long approxTime) {
         for (int i = activeKeys.nextSetBit(0); i >= 0; i = activeKeys.nextSetBit(i + 1)) {
             try {
@@ -762,7 +761,6 @@ final class TcpReplicator<K, V> extends AbstractChannelReplicator implements Clo
     /**
      * called when the selector receives a OP_READ message
      */
-
     private void onRead(@NotNull final SelectionKey key,
                         final long approxTime) throws IOException {
 
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
index a38d324f0..6a55263ad 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
@@ -86,7 +86,6 @@ final class UdpReplicator extends UdpChannelReplicator implements Replica.Modifi
          * @throws InterruptedException
          * @throws java.io.IOException
          */
-
         /**
          * update that are throttled are rejected.
          *
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index db352f1aa..ba19b0119 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -1810,7 +1810,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
         /* Methods with private access modifier considered private to Segment
          * class, although Java allows to access them from outer class anyway.
          */
-
         public final int getIndex() {
             return index;
         }
diff --git a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
index 4fce104d4..4b56083b8 100644
--- a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
@@ -38,12 +38,11 @@ import static org.junit.Assert.assertTrue;
  */
 public class ChannelReplicationTest {
 
+    Set<Thread> threads;
     private ChronicleMap<Integer, CharSequence> map1a;
     private ChronicleMap<Integer, CharSequence> map2a;
-
     private ChronicleMap<Integer, CharSequence> map1b;
     private ChronicleMap<Integer, CharSequence> map2b;
-
     private ReplicationHub hubA;
     private ReplicationHub hubB;
 
@@ -92,8 +91,6 @@ public class ChannelReplicationTest {
         System.gc();
     }
 
-    Set<Thread> threads;
-
     @Before
     public void sampleThreads() {
         threads = Thread.getAllStackTraces().keySet();
@@ -136,7 +133,6 @@ public class ChannelReplicationTest {
      * @param timeOutMs timeout in milliseconds
      * @throws InterruptedException
      */
-
     private void waitTillEqual(final int timeOutMs) throws InterruptedException {
         for (int t = 0; t < timeOutMs; t++) {
             if (map1a.equals(map1b) &&
diff --git a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
index 3a3367b9d..2f4ba6b58 100644
--- a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
@@ -141,7 +141,6 @@ public class PostChannelCreationTest {
      * @param timeOutMs timeout in milliseconds
      * @throws InterruptedException
      */
-
     private void waitTillEqual(final int timeOutMs) throws InterruptedException {
         for (int t = 0; t < timeOutMs; t++) {
             if (map1a.equals(map1b) &&
diff --git a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
index 4def09f54..f36f760c3 100644
--- a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
@@ -132,7 +132,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
             assertTrue(m.containsKey(new DI(i)));
         }
     }*/
-
     /**
      * TODO :     fix test
      * Elements of classes with erased generic type parameters based
@@ -157,7 +156,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         }
     }
 */
-
     /**
      * Elements of non-comparable classes equal to those of classes
      * with erased generic type parameters based on Comparable can be
@@ -176,7 +174,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         }
     }
 */
-
     /**
      * get returns the correct element at the given key, or null if not present
      */
@@ -259,7 +256,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         }
         assertEquals(5, count);
     }*/
-
     /**
      * entrySet.toArray contains all entries
      */
@@ -303,7 +299,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         }
         assertEquals(5, count);
     }*/
-
     /**
      * entrySet contains all pairs
      */
@@ -528,7 +523,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         } catch (IllegalArgumentException success) {
         }
     }*/
-
     /**
      * TODO : Cannot create with negative concurrency level
      */
@@ -539,7 +533,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         } catch (IllegalArgumentException success) {
         }
     }*/
-
     /**
      * TODO :Cannot create with only negative capacity
      */
@@ -550,7 +543,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         } catch (IllegalArgumentException success) {
         }
     }*/
-
     /**
      * replace(null, x) throws NPE
      */
@@ -588,7 +580,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         } catch (NullPointerException success) {
         }
     }*/
-
     /**
      * todo  : contains(null) throws NPE
      */
@@ -602,7 +593,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         }
     }
 */
-
     /**
      * putIfAbsent(x, null) throws NPE
      */
@@ -788,7 +778,6 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
         assertEquals(x, y);
         assertEquals(y, x);
     }*/
-
     /**
      * TODO : SetValue of an EntrySet entry sets value in the map.
      */
diff --git a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
index a61e8c34a..30cfa474a 100644
--- a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
+++ b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java
@@ -114,7 +114,6 @@ public class SingleMapChannelTest {
      * @param timeOutMs timeout in milliseconds
      * @throws InterruptedException
      */
-
     private void waitTillEqual(final int timeOutMs) throws InterruptedException {
         for (int t = 0; t < timeOutMs; t++) {
             if (map1a.equals(map1b))
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
index 2685b54f6..3dff67a59 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java
@@ -38,6 +38,7 @@ import static org.junit.Assert.assertTrue;
 @Ignore
 public class TCPSocketReplication4WayMapTest {
 
+    Set<Thread> threads;
     private ChronicleMap<Integer, CharSequence> map1;
     private ChronicleMap<Integer, CharSequence> map2;
     private ChronicleMap<Integer, CharSequence> map3;
@@ -75,8 +76,6 @@ public class TCPSocketReplication4WayMapTest {
         System.gc();
     }
 
-    Set<Thread> threads;
-
     @Before
     public void sampleThreads() {
         threads = Thread.getAllStackTraces().keySet();
@@ -147,7 +146,6 @@ public class TCPSocketReplication4WayMapTest {
      * @param timeOutMs timeout in milliseconds
      * @throws InterruptedException
      */
-
     private void waitTillEqual(final int timeOutMs) throws InterruptedException {
         int t = 0;
         for (; t < timeOutMs; t++) {
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java b/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
index ac0e75354..31a6831b8 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface.java
@@ -29,11 +29,9 @@ public interface BondVOInterface {
     long getIssueDate();
 
     void setIssueDate(long issueDate);  /* time in millis */
-
     long getMaturityDate();
 
     void setMaturityDate(long maturityDate);  /* time in millis */
-
     long addAtomicMaturityDate(long toAdd);
 
     boolean compareAndSwapCoupon(double expected, double value);
@@ -57,7 +55,6 @@ public interface BondVOInterface {
      …,
      * index_6 = 4.30pm
      */
-
     MarketPx getMarketPxIntraDayHistoryAt(int tradingDayHour);
 
     /* nested interface - empowering an Off-Heap hierarchical “TIER of prices”
diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/ChronicleMapTest.java
index 48eb0c085..eef59fc03 100644
--- a/src/test/java/net/openhft/chronicle/map/jsr166/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/ChronicleMapTest.java
@@ -682,7 +682,6 @@ public class ChronicleMapTest extends JSR166TestCase {
         assertEquals(x, y);
         assertEquals(y, x);
     }*/
-
     /**
      * TODO : SetValue of an EntrySet entry sets value in the map.
      */