diff --git a/src/main/java/dev/openfeature/sdk/EventSupport.java b/src/main/java/dev/openfeature/sdk/EventSupport.java
index 7f616554a..f9bb67dd9 100644
--- a/src/main/java/dev/openfeature/sdk/EventSupport.java
+++ b/src/main/java/dev/openfeature/sdk/EventSupport.java
@@ -163,8 +163,8 @@ static class HandlerStore {
 
         private final Map<ProviderEvent, List<Consumer<EventDetails>>> handlerMap;
 
-        {
-            handlerMap = new ConcurrentHashMap<ProviderEvent, List<Consumer<EventDetails>>>();
+        HandlerStore() {
+            handlerMap = new ConcurrentHashMap<>();
             handlerMap.put(ProviderEvent.PROVIDER_READY, new ArrayList<>());
             handlerMap.put(ProviderEvent.PROVIDER_CONFIGURATION_CHANGED, new ArrayList<>());
             handlerMap.put(ProviderEvent.PROVIDER_ERROR, new ArrayList<>());
diff --git a/src/main/java/dev/openfeature/sdk/ImmutableStructure.java b/src/main/java/dev/openfeature/sdk/ImmutableStructure.java
index 7ea1ef654..d70a01637 100644
--- a/src/main/java/dev/openfeature/sdk/ImmutableStructure.java
+++ b/src/main/java/dev/openfeature/sdk/ImmutableStructure.java
@@ -40,7 +40,7 @@ public ImmutableStructure(Map<String, Value> attributes) {
                 .collect(HashMap::new,
                         (accumulated, entry) -> accumulated.put(entry.getKey(),
                                 Optional.ofNullable(entry.getValue())
-                                    .map(e -> e.clone())
+                                    .map(Value::clone)
                                     .orElse(null)),
                         HashMap::putAll)));
     }
@@ -70,7 +70,7 @@ public Map<String, Value> asMap() {
                 .collect(HashMap::new,
                         (accumulated, entry) -> accumulated.put(entry.getKey(),
                                 Optional.ofNullable(entry.getValue())
-                                .map(e -> e.clone())
+                                .map(Value::clone)
                                 .orElse(null)),
                         HashMap::putAll);
     }
diff --git a/src/main/java/dev/openfeature/sdk/MutableContext.java b/src/main/java/dev/openfeature/sdk/MutableContext.java
index 9e7069ca1..42fc90f58 100644
--- a/src/main/java/dev/openfeature/sdk/MutableContext.java
+++ b/src/main/java/dev/openfeature/sdk/MutableContext.java
@@ -145,7 +145,7 @@ public MutableStructure add(String ignoredKey, List<Value> ignoredValue) {
             return null;
         }
 
-        public MutableStructure add(String ignoredKey, MutableStructure ignoredValue) {
+        public MutableStructure add(String ignoredKey, Structure ignoredValue) {
             return null;
         }
 
diff --git a/src/main/java/dev/openfeature/sdk/MutableStructure.java b/src/main/java/dev/openfeature/sdk/MutableStructure.java
index 3c4f34dd0..fadd68051 100644
--- a/src/main/java/dev/openfeature/sdk/MutableStructure.java
+++ b/src/main/java/dev/openfeature/sdk/MutableStructure.java
@@ -75,7 +75,7 @@ public MutableStructure add(String key, Structure value) {
         return this;
     }
 
-    public <T> MutableStructure add(String key, List<Value> value) {
+    public MutableStructure add(String key, List<Value> value) {
         attributes.put(key, new Value(value));
         return this;
     }
diff --git a/src/main/java/dev/openfeature/sdk/NoOpProvider.java b/src/main/java/dev/openfeature/sdk/NoOpProvider.java
index d3d9ca21b..ef8cf1f83 100644
--- a/src/main/java/dev/openfeature/sdk/NoOpProvider.java
+++ b/src/main/java/dev/openfeature/sdk/NoOpProvider.java
@@ -18,12 +18,7 @@ public ProviderState getState() {
 
     @Override
     public Metadata getMetadata() {
-        return new Metadata() {
-            @Override
-            public String getName() {
-                return name;
-            }
-        };
+        return () -> name;
     }
 
     @Override
diff --git a/src/main/java/dev/openfeature/sdk/ProviderRepository.java b/src/main/java/dev/openfeature/sdk/ProviderRepository.java
index 0b4f87441..8dee0a6f3 100644
--- a/src/main/java/dev/openfeature/sdk/ProviderRepository.java
+++ b/src/main/java/dev/openfeature/sdk/ProviderRepository.java
@@ -168,7 +168,6 @@ private boolean isProviderRegistered(FeatureProvider provider) {
     private void shutdownProvider(FeatureProvider provider) {
         taskExecutor.submit(() -> {
             try {
-                // detachProviderEvents(provider);
                 provider.shutdown();
             } catch (Exception e) {
                 log.error("Exception when shutting down feature provider {}", provider.getClass().getName(), e);
diff --git a/src/main/java/dev/openfeature/sdk/Value.java b/src/main/java/dev/openfeature/sdk/Value.java
index 59e4a9cf5..f0fdc8d45 100644
--- a/src/main/java/dev/openfeature/sdk/Value.java
+++ b/src/main/java/dev/openfeature/sdk/Value.java
@@ -266,7 +266,6 @@ public Instant asInstant() {
      *
      * @return Value
      */
-
     @SneakyThrows
     @Override
     protected Value clone() {
diff --git a/src/main/java/dev/openfeature/sdk/providers/memory/InMemoryProvider.java b/src/main/java/dev/openfeature/sdk/providers/memory/InMemoryProvider.java
index f71e9e364..8cd9fc8dc 100644
--- a/src/main/java/dev/openfeature/sdk/providers/memory/InMemoryProvider.java
+++ b/src/main/java/dev/openfeature/sdk/providers/memory/InMemoryProvider.java
@@ -52,6 +52,7 @@ public InMemoryProvider(Map<String, Flag<?>> flags) {
      * @param evaluationContext evaluation context
      * @throws Exception on error
      */
+    @Override
     public void initialize(EvaluationContext evaluationContext) throws Exception {
         super.initialize(evaluationContext);
         state = ProviderState.READY;