diff --git a/unleash-client-java/src/main/java/no/finn/unleash/Unleash.java b/unleash-client-java/src/main/java/no/finn/unleash/Unleash.java
index 384220552b..f43e43c240 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/Unleash.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/Unleash.java
@@ -2,6 +2,7 @@ package no.finn.unleash;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import no.finn.unleash.repository.ToggleException;
 import no.finn.unleash.repository.ToggleRepository;
 import no.finn.unleash.strategy.DefaultStrategy;
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleBackupFileHandler.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleBackupFileHandler.java
index ef5b43e14b..a64bc5884f 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleBackupFileHandler.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleBackupFileHandler.java
@@ -6,6 +6,7 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collections;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleRepository.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleRepository.java
index d9f5e88d1f..7416cbc7bd 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleRepository.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/FeatureToggleRepository.java
@@ -8,6 +8,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+
 import no.finn.unleash.Toggle;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/HTTPToggleRepository.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/HTTPToggleRepository.java
index e42a27710d..1e0d87bb42 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/HTTPToggleRepository.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/HTTPToggleRepository.java
@@ -2,6 +2,7 @@ package no.finn.unleash.repository;
 
 import java.io.IOException;
 import java.util.Collection;
+
 import no.finn.unleash.Toggle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,7 +25,7 @@ public class HTTPToggleRepository implements ToggleRepository {
     }
 
     @Override
-    public Toggle getToggle(final String name) throws ToggleException {
+    public final Toggle getToggle(final String name) throws ToggleException {
         try {
             for (Toggle toggle : fetchToggles()) {
                 if (name.equals(toggle.getName())) {
@@ -40,7 +41,7 @@ public class HTTPToggleRepository implements ToggleRepository {
     }
 
     @Override
-    public Collection<Toggle> getToggles() {
+    public final Collection<Toggle> getToggles() {
         try {
             return fetchToggles();
         } catch (IOException e) {
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/JsonToggleParser.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/JsonToggleParser.java
index 2eefc5650a..a6537096a4 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/JsonToggleParser.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/JsonToggleParser.java
@@ -2,12 +2,16 @@ package no.finn.unleash.repository;
 
 import java.io.Reader;
 import java.util.Collection;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import no.finn.unleash.Toggle;
 
 public final class JsonToggleParser {
 
+    private JsonToggleParser() {
+    }
+
     public static Toggle toToggle(String jsonString) {
         Gson gson = new GsonBuilder().create();
         return gson.fromJson(jsonString, Toggle.class);
@@ -41,7 +45,7 @@ public final class JsonToggleParser {
 
     public static ToggleCollection collectionFormJson(Reader reader) {
         Gson gson = new GsonBuilder().create();
-        ToggleCollection gsonCollection = gson.fromJson(reader,ToggleCollection.class);
+        ToggleCollection gsonCollection = gson.fromJson(reader, ToggleCollection.class);
         return new ToggleCollection(gsonCollection.getFeatures());
     }
 }
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/PollingToggleRepository.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/PollingToggleRepository.java
index d0c4b0e109..00a92ff387 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/PollingToggleRepository.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/PollingToggleRepository.java
@@ -15,6 +15,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+
 import no.finn.unleash.Toggle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,12 +53,12 @@ public class PollingToggleRepository implements ToggleRepository {
     }
 
     @Override
-    public Toggle getToggle(final String name){
+    public final Toggle getToggle(final String name){
         return togglesCache.get(name);
     }
 
     @Override
-    public Collection<Toggle> getToggles() {
+    public final Collection<Toggle> getToggles() {
         return Collections.unmodifiableCollection(togglesCache.values());
     }
 
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleCollection.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleCollection.java
index b6983f111b..4019b3c9b9 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleCollection.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleCollection.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+
 import no.finn.unleash.Toggle;
 
 final class ToggleCollection {
diff --git a/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleRepository.java b/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleRepository.java
index 4a49ef2c01..883c6d5f86 100644
--- a/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleRepository.java
+++ b/unleash-client-java/src/main/java/no/finn/unleash/repository/ToggleRepository.java
@@ -1,6 +1,7 @@
 package no.finn.unleash.repository;
 
 import java.util.Collection;
+
 import no.finn.unleash.Toggle;
 
 public interface ToggleRepository {
diff --git a/unleash-client-java/src/test/java/no/finn/unleash/ManualTesting.java b/unleash-client-java/src/test/java/no/finn/unleash/ManualTesting.java
index ef6e63b870..bb9746b1b8 100644
--- a/unleash-client-java/src/test/java/no/finn/unleash/ManualTesting.java
+++ b/unleash-client-java/src/test/java/no/finn/unleash/ManualTesting.java
@@ -2,9 +2,8 @@ package no.finn.unleash;
 
 import java.net.URI;
 import java.util.Random;
+
 import no.finn.unleash.repository.FeatureToggleRepository;
-import no.finn.unleash.repository.HTTPToggleRepository;
-import no.finn.unleash.repository.PollingToggleRepository;
 import no.finn.unleash.repository.ToggleRepository;
 
 public class ManualTesting {
diff --git a/unleash-client-java/src/test/java/no/finn/unleash/UnleashTest.java b/unleash-client-java/src/test/java/no/finn/unleash/UnleashTest.java
index a38256681e..1e1be7df20 100644
--- a/unleash-client-java/src/test/java/no/finn/unleash/UnleashTest.java
+++ b/unleash-client-java/src/test/java/no/finn/unleash/UnleashTest.java
@@ -7,9 +7,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyMap;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class UnleashTest {
 
diff --git a/unleash-client-java/src/test/java/no/finn/unleash/repository/HttpToggleFetcherTest.java b/unleash-client-java/src/test/java/no/finn/unleash/repository/HttpToggleFetcherTest.java
index 7a0ee51447..033c198931 100644
--- a/unleash-client-java/src/test/java/no/finn/unleash/repository/HttpToggleFetcherTest.java
+++ b/unleash-client-java/src/test/java/no/finn/unleash/repository/HttpToggleFetcherTest.java
@@ -1,11 +1,10 @@
 package no.finn.unleash.repository;
 
 import java.net.URI;
+
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class HttpToggleFetcherTest {
 
 
diff --git a/unleash-client-java/src/test/java/no/finn/unleash/repository/JsonToggleParserTest.java b/unleash-client-java/src/test/java/no/finn/unleash/repository/JsonToggleParserTest.java
index ee98c896e9..9918ee9e65 100644
--- a/unleash-client-java/src/test/java/no/finn/unleash/repository/JsonToggleParserTest.java
+++ b/unleash-client-java/src/test/java/no/finn/unleash/repository/JsonToggleParserTest.java
@@ -5,8 +5,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+
 import no.finn.unleash.Toggle;
 import org.junit.Test;