diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java
index 8aeb2eff10..5a47708e43 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java
@@ -39,9 +39,7 @@ import ghidra.program.model.symbol.*;
 import ghidra.program.model.util.AddressLabelInfo;
 import ghidra.program.util.DefaultLanguageService;
 import ghidra.program.util.GhidraProgramUtilities;
-import ghidra.util.InvalidNameException;
-import ghidra.util.MD5Utilities;
-import ghidra.util.HashUtilities;
+import ghidra.util.*;
 import ghidra.util.exception.*;
 import ghidra.util.task.TaskMonitor;
 
@@ -112,8 +110,8 @@ public abstract class AbstractProgramLoader implements Loader {
 			return results;
 		}
 
-		List<Program> programs = loadProgram(provider, name, folder, loadSpec, options, messageLog,
-			consumer, monitor);
+		List<Program> programs =
+			loadProgram(provider, name, folder, loadSpec, options, messageLog, consumer, monitor);
 
 		boolean success = false;
 		try {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java
index ab99d72d18..efeb0afadf 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java
@@ -102,7 +102,7 @@ public interface Program extends DataTypeManagerDomainObject {
 	public SymbolTable getSymbolTable();
 
 	/**
-
+	
 	 * Returns the external manager.
 	 */
 	public ExternalManager getExternalManager();
@@ -355,8 +355,8 @@ public interface Program extends DataTypeManagerDomainObject {
 	 * This will never be thrown if commit is false.
 	 * @throws IllegalStateException if the program state is not suitable for setting the image base.
 	 */
-	public void setImageBase(Address base, boolean commit) throws AddressOverflowException,
-			LockException, IllegalStateException;
+	public void setImageBase(Address base, boolean commit)
+			throws AddressOverflowException, LockException, IllegalStateException;
 
 	/**
 	 * Restores the last committed image base.
@@ -377,8 +377,8 @@ public interface Program extends DataTypeManagerDomainObject {
 	 * @throws LockException if the program is shared and not checked out exclusively.
 	 */
 	public void setLanguage(Language language, CompilerSpecID compilerSpecID,
-			boolean forceRedisassembly, TaskMonitor monitor) throws IllegalStateException,
-			IncompatibleLanguageException, LockException;
+			boolean forceRedisassembly, TaskMonitor monitor)
+			throws IllegalStateException, IncompatibleLanguageException, LockException;
 
 	/**
 	 * Returns the global namespace for this program
diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/ProgramTestDouble.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/ProgramTestDouble.java
index fdbd8ed09a..79fb37a1ef 100644
--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/ProgramTestDouble.java
+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/ProgramTestDouble.java
@@ -15,6 +15,10 @@
  */
 package ghidra.program.model;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
 import ghidra.framework.model.*;
 import ghidra.framework.options.Options;
 import ghidra.framework.store.LockException;
@@ -34,10 +38,6 @@ import ghidra.util.exception.CancelledException;
 import ghidra.util.exception.DuplicateNameException;
 import ghidra.util.task.TaskMonitor;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
 public class ProgramTestDouble implements Program {
 
 	@Override
@@ -111,8 +111,8 @@ public class ProgramTestDouble implements Program {
 	}
 
 	@Override
-	public void saveToPackedFile(File outputFile, TaskMonitor monitor) throws IOException,
-			CancelledException {
+	public void saveToPackedFile(File outputFile, TaskMonitor monitor)
+			throws IOException, CancelledException {
 		throw new UnsupportedOperationException();
 	}
 
@@ -517,8 +517,8 @@ public class ProgramTestDouble implements Program {
 	}
 
 	@Override
-	public void setImageBase(Address base, boolean commit) throws AddressOverflowException,
-			LockException, IllegalStateException {
+	public void setImageBase(Address base, boolean commit)
+			throws AddressOverflowException, LockException, IllegalStateException {
 		throw new UnsupportedOperationException();
 	}
 
@@ -529,8 +529,8 @@ public class ProgramTestDouble implements Program {
 
 	@Override
 	public void setLanguage(Language language, CompilerSpecID compilerSpecID,
-			boolean forceRedisassembly, TaskMonitor monitor) throws IllegalStateException,
-			IncompatibleLanguageException, LockException {
+			boolean forceRedisassembly, TaskMonitor monitor)
+			throws IllegalStateException, IncompatibleLanguageException, LockException {
 		throw new UnsupportedOperationException();
 	}