diff --git a/integrations/cdi3/src/main/java/one/microstream/integrations/cdi/types/Storage.java b/integrations/cdi3/src/main/java/one/microstream/integrations/cdi/types/Storage.java
index e42f762e5..a33017107 100644
--- a/integrations/cdi3/src/main/java/one/microstream/integrations/cdi/types/Storage.java
+++ b/integrations/cdi3/src/main/java/one/microstream/integrations/cdi/types/Storage.java
@@ -1,12 +1,7 @@
 
 package one.microstream.integrations.cdi.types;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*-
+/*-w
  * #%L
  * microstream-integrations-cdi3
  * %%
@@ -26,6 +21,11 @@
  * #L%
  */
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import jakarta.enterprise.inject.Alternative;
 import jakarta.enterprise.inject.Stereotype;
 
diff --git a/integrations/spring-boot/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java b/integrations/spring-boot/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
index 1a0d22d75..6b4fc0525 100644
--- a/integrations/spring-boot/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
+++ b/integrations/spring-boot/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
@@ -1,25 +1,5 @@
 package one.microstream.integrations.spring.boot.types.storage;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
 /*-
  * #%L
  * microstream-integrations-spring-boot
@@ -40,6 +20,26 @@
  * #L%
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
 import one.microstream.integrations.spring.boot.types.MultipleStorageBeanException;
 import one.microstream.integrations.spring.boot.types.Storage;
 import one.microstream.integrations.spring.boot.types.config.StorageManagerInitializer;
diff --git a/integrations/spring-boot3/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java b/integrations/spring-boot3/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
index b75109e3d..464c59d82 100644
--- a/integrations/spring-boot3/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
+++ b/integrations/spring-boot3/src/main/java/one/microstream/integrations/spring/boot/types/storage/StorageBeanFactory.java
@@ -1,25 +1,5 @@
 package one.microstream.integrations.spring.boot.types.storage;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
 /*-
  * #%L
  * microstream-integrations-spring-boot3
@@ -40,6 +20,26 @@
  * #L%
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
 import one.microstream.integrations.spring.boot.types.MultipleStorageBeanException;
 import one.microstream.integrations.spring.boot.types.Storage;
 import one.microstream.integrations.spring.boot.types.config.StorageManagerInitializer;