diff --git a/jsign-core/src/main/java/net/jsign/Signable.java b/jsign-core/src/main/java/net/jsign/Signable.java
index 072e9034..5c04e815 100644
--- a/jsign-core/src/main/java/net/jsign/Signable.java
+++ b/jsign-core/src/main/java/net/jsign/Signable.java
@@ -27,11 +27,11 @@
 import org.bouncycastle.asn1.cms.ContentInfo;
 import org.bouncycastle.cms.CMSSignedData;
 
+import net.jsign.appx.APPXFile;
 import net.jsign.asn1.authenticode.AuthenticodeObjectIdentifiers;
 import net.jsign.cat.CatalogFile;
 import net.jsign.mscab.MSCabinetFile;
 import net.jsign.msi.MSIFile;
-import net.jsign.appx.APPXFile;
 import net.jsign.navx.NAVXFile;
 import net.jsign.pe.PEFile;
 import net.jsign.script.JScript;
diff --git a/jsign-core/src/main/java/net/jsign/jca/AmazonIMDS2Client.java b/jsign-core/src/main/java/net/jsign/jca/AmazonIMDS2Client.java
index c67263f8..cdf79381 100644
--- a/jsign-core/src/main/java/net/jsign/jca/AmazonIMDS2Client.java
+++ b/jsign-core/src/main/java/net/jsign/jca/AmazonIMDS2Client.java
@@ -24,9 +24,8 @@
 import java.net.UnknownServiceException;
 import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
-
 import com.cedarsoftware.util.io.JsonReader;
+import org.apache.commons.io.IOUtils;
 
 import static java.nio.charset.StandardCharsets.*;
 
diff --git a/jsign-core/src/main/java/net/jsign/jca/AzureKeyVaultSigningService.java b/jsign-core/src/main/java/net/jsign/jca/AzureKeyVaultSigningService.java
index 7c83a96a..0ad5558d 100644
--- a/jsign-core/src/main/java/net/jsign/jca/AzureKeyVaultSigningService.java
+++ b/jsign-core/src/main/java/net/jsign/jca/AzureKeyVaultSigningService.java
@@ -32,12 +32,12 @@
 import java.util.Map;
 
 import com.cedarsoftware.util.io.JsonWriter;
-
-import net.jsign.DigestAlgorithm;
 import org.bouncycastle.asn1.DERNull;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.DigestInfo;
 
+import net.jsign.DigestAlgorithm;
+
 /**
  * Signing service using the Azure KeyVault API.
  *
diff --git a/jsign-core/src/test/java/net/jsign/appx/APPXFileTest.java b/jsign-core/src/test/java/net/jsign/appx/APPXFileTest.java
index 3078894c..ac17f8bd 100644
--- a/jsign-core/src/test/java/net/jsign/appx/APPXFileTest.java
+++ b/jsign-core/src/test/java/net/jsign/appx/APPXFileTest.java
@@ -25,7 +25,6 @@
 import org.junit.Test;
 
 import net.jsign.AuthenticodeSigner;
-import net.jsign.DigestAlgorithm;
 import net.jsign.KeyStoreBuilder;
 
 import static java.nio.charset.StandardCharsets.*;
diff --git a/jsign-core/src/test/java/net/jsign/mscab/MSCabinetFileTest.java b/jsign-core/src/test/java/net/jsign/mscab/MSCabinetFileTest.java
index aa98ebe3..c51c11f7 100644
--- a/jsign-core/src/test/java/net/jsign/mscab/MSCabinetFileTest.java
+++ b/jsign-core/src/test/java/net/jsign/mscab/MSCabinetFileTest.java
@@ -28,7 +28,6 @@
 
 import net.jsign.AuthenticodeSigner;
 import net.jsign.KeyStoreBuilder;
-import net.jsign.appx.APPXFile;
 
 import static net.jsign.DigestAlgorithm.*;
 import static net.jsign.SignatureAssert.*;