diff --git a/pom.xml b/pom.xml
index 91bcfdc30..5bc086907 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -25,7 +24,7 @@
                 <groupId>net.openhft</groupId>
                 <artifactId>third-party-bom</artifactId>
                 <type>pom</type>
-                <version>3.19.2</version>
+                <version>3.19.4</version>
                 <scope>import</scope>
             </dependency>
 
@@ -73,10 +72,8 @@
     <dependencies>
 
         <dependency>
-            <!-- https://github.com/OpenHFT/Chronicle-Map/issues/222 -->
-            <groupId>com.intellij</groupId>
+            <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>12.0</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
index 14ef6aec0..38bea5bb9 100755
--- a/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/VanillaChronicleHash.java
@@ -67,7 +67,6 @@ import static net.openhft.chronicle.hash.impl.CompactOffHeapLinearHashTable.*;
 import static net.openhft.chronicle.map.ChronicleHashCorruptionImpl.format;
 import static net.openhft.chronicle.map.ChronicleHashCorruptionImpl.report;
 
-
 public abstract class VanillaChronicleHash<K,
                                            C extends HashEntry<K>, SC extends HashSegmentContext<K, ?>,
                                            ECQ extends ExternalHashQueryContext<K>>
diff --git a/src/test/java/net/openhft/chronicle/map/Issue229Test.java b/src/test/java/net/openhft/chronicle/map/Issue229Test.java
index 846aa313a..5b43bf107 100644
--- a/src/test/java/net/openhft/chronicle/map/Issue229Test.java
+++ b/src/test/java/net/openhft/chronicle/map/Issue229Test.java
@@ -49,8 +49,7 @@ public class Issue229Test {
                 .entries(10)
                 .createPersistedTo(mapFile)) {
 
-
-            // It shall not be possible to recover since the
+// It shall not be possible to recover since the
             // file is open by the readMap
             try (ChronicleMap<Long, Long> recoverMap = ChronicleMap
                     .of(Long.class, Long.class)
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolation.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolation.java
index cc827a738..30c2371c0 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolation.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolation.java
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid;
 
-
 public interface ChronicleAcidIsolation extends java.sql.Connection{
 
     int LOWEST_LATENCY = ChronicleAcidIsolation.TRANSACTION_NONE;
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolationGovernor.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolationGovernor.java
index e5b52ccbe..db8dfa975 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolationGovernor.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/ChronicleAcidIsolationGovernor.java
@@ -17,8 +17,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
     private String priorCusip;
     private Double  aCoupon;
 
-
-    public synchronized void put(String cusip, BondVOInterface bond) throws Exception {
+public synchronized void put(String cusip, BondVOInterface bond) throws Exception {
 
         System.out.println(
                 " , @t="+System.currentTimeMillis()+
@@ -39,8 +38,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         );
     }
 
-
-    //here is where the drama happens
+//here is where the drama happens
     public synchronized BondVOInterface get(String cusip) throws Exception {
         System.out.println(
                         " , @t="+System.currentTimeMillis()+
@@ -175,8 +173,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
     // intense.  In the real world, even in Captital Markets 'dirty read' intolerance
     // is likely the only isolation level Chronicle would accommodate.
 
-
-    @Override
+@Override
     public void setAutoCommit(boolean autoCommit) throws SQLException {
 
     }
@@ -186,8 +183,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         return false;
     }
 
-
-    @Override
+@Override
     public void rollback(Savepoint savepoint) throws SQLException {
 
     }
@@ -197,9 +193,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
 
     }
 
-
-
-    @Override
+@Override
     public Statement createStatement() throws SQLException {
         return null;
     }
@@ -219,8 +213,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         return null;
     }
 
-
-    @Override
+@Override
     public boolean isClosed() throws SQLException {
         return false;
     }
@@ -250,8 +243,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         return null;
     }
 
-
-    @Override
+@Override
     public SQLWarning getWarnings() throws SQLException {
         return null;
     }
@@ -306,8 +298,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         return null;
     }
 
-
-    @Override
+@Override
     public void releaseSavepoint(Savepoint savepoint) throws SQLException {
 
     }
@@ -432,5 +423,4 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation {
         return false;
     }
 
-
 }
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 0920ebe35..c4b85399e 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
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid.exodus;
 
-
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadTolerance.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadTolerance.java
index 6b5a77e2b..27c909f4a 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadTolerance.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/exodus/DirtyReadTolerance.java
@@ -9,7 +9,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.locks.StampedLock;
 
-
 public class DirtyReadTolerance<K,V> {
 
     public static void main(String args[]) throws Exception {
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 c3dfe2d6c..07e793748 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
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid.exodus;
 
-
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 import net.openhft.chronicle.map.fromdocs.acid.ChronicleAcidIsolation;
@@ -27,8 +26,7 @@ public class DirtyReadVictim implements Runnable {
         Scanner sc = new Scanner(System.in);
         try {
 
-
-            /**
+/**
              *  ben.cotton@rutgers.edu   START
              */
             Double coupon = 0.00;
@@ -99,8 +97,7 @@ public class DirtyReadVictim implements Runnable {
         }
     }
 
-
-    public ChronicleMap getCraig() {
+public ChronicleMap getCraig() {
         return this.chm;
     }
 
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 2e5125267..856e24d94 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
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid.genesis;
 
-
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadTolerance.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadTolerance.java
index 4fbd115a8..89be5f66b 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadTolerance.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/genesis/DirtyReadTolerance.java
@@ -9,7 +9,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.locks.StampedLock;
 
-
 public class DirtyReadTolerance<K,V> {
 
     public static void main(String args[]) throws Exception {
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 753d8de94..06511e84d 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
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid.genesis;
 
-
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 import net.openhft.chronicle.map.fromdocs.acid.ChronicleAcidIsolation;
@@ -27,8 +26,7 @@ public class DirtyReadVictim implements Runnable {
         Scanner sc = new Scanner(System.in);
         try {
 
-
-            /**
+/**
              *  ben.cotton@rutgers.edu   START
              */
             Double coupon = 0.00;
@@ -99,8 +97,7 @@ public class DirtyReadVictim implements Runnable {
         }
     }
 
-
-    public ChronicleMap getCraig() {
+public ChronicleMap getCraig() {
         return this.chm;
     }
 
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 94d576137..d49335bcf 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
@@ -41,8 +41,7 @@ public class ChronicleStampedLock extends StampedLock {
             LongValue.class
     ); //WriterSet cardinality
 
-
-    ChronicleStampedLock(String chronicelStampedLockLocality) { // path of Operand set i.e. /dev/shm/
+ChronicleStampedLock(String chronicelStampedLockLocality) { // path of Operand set i.e. /dev/shm/
         try {
             chm = offHeapLock(chronicelStampedLockLocality);
             chmR = offHeapLockReaderCount(chronicelStampedLockLocality + "=ReaderCount");
@@ -120,8 +119,7 @@ public class ChronicleStampedLock extends StampedLock {
         lastWriterT = chm.get("LastWriterTime ");
         writeLockHolderCount = chmW.get("WriterCount ");
 
-
-        l = offHeapLock.getEntryLockState();
+l = offHeapLock.getEntryLockState();
 
         if (l != 0L)
             return 0L;
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLockTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLockTest.java
index e99ff204a..4e5e7413d 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLockTest.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/ChronicleStampedLockTest.java
@@ -8,8 +8,7 @@ import org.junit.*;
 
 public class ChronicleStampedLockTest {
 
-
-    @Test
+@Test
     public void tryOptimisticRead() {
         Assert.assertEquals(Boolean.TRUE, Boolean.TRUE);
     }
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadTolerance.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadTolerance.java
index ea62b4f3f..d4d4426f2 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadTolerance.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/revelations/DirtyReadTolerance.java
@@ -1,6 +1,5 @@
 package net.openhft.chronicle.map.fromdocs.acid.revelations;
 
-
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
@@ -11,7 +10,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.locks.StampedLock;
 
-
 public class DirtyReadTolerance<K,V> {
 
     public static void main(String args[]) throws Exception {
@@ -40,5 +38,4 @@ public class DirtyReadTolerance<K,V> {
         //.create();
     }
 
-
 }
\ No newline at end of file
diff --git a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender.java
index ca9f08ef8..ecf1838b2 100644
--- a/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender.java
+++ b/src/test/java/net/openhft/chronicle/map/locks/DirtyReadOffender.java
@@ -9,7 +9,6 @@ import static net.openhft.chronicle.values.Values.newNativeReference;
 
 //import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 
-
 public class DirtyReadOffender {
 
     public static void main(String[] args) {