diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
index e0e00f24b..94dae6b5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindValuesKey.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.api;
 
 import io.ebean.bean.EntityBean;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 892739d0b..3f34efa21 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
@@ -20,10 +22,8 @@ import io.ebeaninternal.server.expression.SimpleExpression;
 import io.ebeaninternal.server.query.NativeSqlQueryPlanKey;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
-import jakarta.persistence.PersistenceException;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.*;