diff --git a/src/main/java/net/openhft/chronicle/hash/impl/TierCountersArea.java b/src/main/java/net/openhft/chronicle/hash/impl/TierCountersArea.java
index c7cb7d073..918142f37 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/TierCountersArea.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/TierCountersArea.java
@@ -25,7 +25,8 @@ import net.openhft.chronicle.core.OS;
  * are stateful - so need to keep an instance in thread local that seems to be overall more pain
  * than gain.
  */
-public enum TierCountersArea {;
+public enum TierCountersArea {
+    ; // none
 
     public static final long NEXT_TIER_INDEX_OFFSET = 0L;
     public static final long PREV_TIER_INDEX_OFFSET = NEXT_TIER_INDEX_OFFSET + 8L;
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/ChecksumHashing.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/ChecksumHashing.java
index f20e8f454..a5b33a39f 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/ChecksumHashing.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/ChecksumHashing.java
@@ -16,7 +16,8 @@
 
 package net.openhft.chronicle.hash.impl.stage.entry;
 
-public enum ChecksumHashing {;
+public enum ChecksumHashing {
+    ; // none
 
     /**
      * A smart procedure copied from CityHash/FarmHash, see the full implementation in
diff --git a/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java b/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
index fff4a4572..6ff5f68be 100644
--- a/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
+++ b/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
@@ -3,7 +3,8 @@ package net.openhft.chronicle.map.internal;
 import net.openhft.chronicle.core.analytics.AnalyticsFacade;
 import net.openhft.chronicle.core.pom.PomProperties;
 
-public enum AnalyticsHolder {;
+public enum AnalyticsHolder {
+    ; // none
 
     // Todo: VERSION is "unknown" for some reason
     private static final String VERSION = PomProperties.version("net.openhft", "chronicle-map");
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadOffender.java
index b3cd15cd8..72b211f61 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadOffender.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadOffender.java
@@ -42,7 +42,8 @@ public class DirtyReadOffender implements Runnable {
                     " @t=" + System.currentTimeMillis() +
                             " DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
             );
-            while ((stamp = this.offHeapLock.writeLock()) == 0) {;
+            while ((stamp = this.offHeapLock.writeLock()) == 0) {
+    ; // none
             }
             System.out.println(
                     " @t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadVictim.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadVictim.java
index 7308ad2f4..afa1d21e8 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadVictim.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadVictim.java
@@ -36,7 +36,8 @@ public class DirtyReadVictim implements Runnable {
                     " ,,@t=" + System.currentTimeMillis() +
                             " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()"
             );
-            while ((stamp = this.offHeapLock.tryOptimisticRead()) == 0) {;
+            while ((stamp = this.offHeapLock.tryOptimisticRead()) == 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadOffender.java
index 90f3fc93a..8d9e38d54 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadOffender.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadOffender.java
@@ -42,7 +42,8 @@ public class DirtyReadOffender implements Runnable {
                     " @t=" + System.currentTimeMillis() +
                             " DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
             );
-            while ((stamp = this.offHeapLock.writeLock()) == 0) {;
+            while ((stamp = this.offHeapLock.writeLock()) == 0) {
+    ; // none
             }
             System.out.println(
                     " @t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadVictim.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadVictim.java
index c76b06634..74b66d2ed 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadVictim.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadVictim.java
@@ -36,7 +36,8 @@ public class DirtyReadVictim implements Runnable {
                     " ,,@t=" + System.currentTimeMillis() +
                             " DirtyReadVictim CALLING offHeapLock.tryOptimisticRead()"
             );
-            while ((stamp = this.offHeapLock.tryOptimisticRead()) == 0) {;
+            while ((stamp = this.offHeapLock.tryOptimisticRead()) == 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
index 10f92abda..ab31a7d75 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLock.java
@@ -368,7 +368,8 @@ public class ChronicleStampedLock extends StampedLock {
             unlockWrite(stamp);
         } else if (stamp > 0L) {
             unlockRead(stamp);
-        } else {;// lock available
+        } else {
+    ; // none// lock available
         }
     }
 
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadIntolerant.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadIntolerant.java
index b4372fcc4..58c590a0c 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadIntolerant.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadIntolerant.java
@@ -39,7 +39,8 @@ public class DirtyReadIntolerant {
                             " DirtyReadIntolerant sleeping " + sleepMock + " seconds"
             );
             Thread.sleep(sleepMock * 1_000);
-            while ((stamp = offHeapLock.readLock()) < 0) {;
+            while ((stamp = offHeapLock.readLock()) < 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
index 8fc2d4e68..893566d6b 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadOffender.java
@@ -56,7 +56,8 @@ public class DirtyReadOffender {
                     " @t=" + System.currentTimeMillis() +
                             " DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
             );
-            while ((stamp = offHeapLock.writeLock()) == 0) {;
+            while ((stamp = offHeapLock.writeLock()) == 0) {
+    ; // none
             }
             System.out.println(
                     " @t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictimTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictimTest.java
index 6b842b2c1..f54a8ce8e 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictimTest.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadVictimTest.java
@@ -43,7 +43,8 @@ public class DirtyReadVictimTest {
                     OS.getTarget() + "/OPERAND_ChronicleStampedLock"
                     /*"C:\\Users\\buddy\\dev\\shm\\OPERAND_ChronicleStampedLock"*/
             );
-            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {;
+            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java
index d10092d8b..36bb08e95 100644
--- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java
+++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderIPCTest.java
@@ -63,7 +63,8 @@ public class DirtyReadOffenderIPCTest implements Runnable {
                     "..... @t=" + System.currentTimeMillis() +
                             " DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
             );
-            while ((stamp = offHeapLock.writeLock()) == 0) {;
+            while ((stamp = offHeapLock.writeLock()) == 0) {
+    ; // none
             }
             System.out.println(
                     "..... @t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java
index 9a929238c..ed1afd210 100644
--- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java
+++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffenderTest.java
@@ -52,7 +52,8 @@ class DirtyReadOffenderTest implements Runnable {
                     "..... @t=" + System.currentTimeMillis() +
                             " DirtyReadOffender ACQUIRING offHeapLock.writeLock();"
             );
-            while ((stamp = offHeapLock.writeLock()) == 0) {;
+            while ((stamp = offHeapLock.writeLock()) == 0) {
+    ; // none
             }
             System.out.println(
                     "..... @t=" + System.currentTimeMillis() +
diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java
index 5df266406..40834ef02 100644
--- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java
+++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadVictimIPCTest.java
@@ -84,7 +84,8 @@ public class DirtyReadVictimIPCTest {
                     OS.getTarget() + "/shm-" +
                             "OPERAND_ChronicleStampedLock"
             );
-            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {;
+            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +
@@ -178,7 +179,8 @@ public class DirtyReadVictimIPCTest {
                     OS.getTarget() + "/shm-"
                             + "OPERAND_ChronicleStampedLock"
             );
-            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {;
+            while ((stamp = offHeapLock.tryOptimisticRead()) == 0) {
+    ; // none
             }
             System.out.println(
                     " ,,@t=" + System.currentTimeMillis() +