diff --git a/src/org/omegat/core/data/RealProject.java b/src/org/omegat/core/data/RealProject.java
index 4483182a8b..9c00ed5417 100644
--- a/src/org/omegat/core/data/RealProject.java
+++ b/src/org/omegat/core/data/RealProject.java
@@ -497,7 +497,7 @@ public Map<EntryKey, ITMXEntry> align(final ProjectProperties props, final File
         File root = new File(config.getSourceRoot());
         List<File> srcFileList = FileUtil.buildFileList(root, true);
 
-        AlignFilesCallback alignFilesCallback = new AlignFilesCallback(props, filterMaster, segmenter);
+        AlignFilesCallback alignFilesCallback = new AlignFilesCallback(props, segmenter, filterMaster);
 
         String srcRoot = config.getSourceRoot();
         for (File file : srcFileList) {
@@ -1944,12 +1944,11 @@ protected String getSegmentTranslation(String id, int segmentIndex, String segme
     }
 
     static class AlignFilesCallback implements IAlignCallback {
-        AlignFilesCallback(ProjectProperties props, FilterMaster filterMaster, Segmenter segmenter) {
+        AlignFilesCallback(ProjectProperties props, Segmenter segmenter, FilterMaster filterMaster) {
             super();
             this.config = props;
-            fm = filterMaster;
             this.segmenter = segmenter;
-
+            fm = filterMaster;
         }
 
         Map<EntryKey, ITMXEntry> data = new TreeMap<>();
diff --git a/src/org/omegat/core/statistics/FindMatches.java b/src/org/omegat/core/statistics/FindMatches.java
index c254074c5b..0bfca124a6 100644
--- a/src/org/omegat/core/statistics/FindMatches.java
+++ b/src/org/omegat/core/statistics/FindMatches.java
@@ -38,7 +38,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.omegat.core.Core;
 import org.omegat.core.data.EntryKey;
 import org.omegat.core.data.ExternalTMFactory;
 import org.omegat.core.data.ExternalTMX;
diff --git a/src/org/omegat/gui/main/ProjectUICommands.java b/src/org/omegat/gui/main/ProjectUICommands.java
index 43065c1cb7..8bb8286cd2 100644
--- a/src/org/omegat/gui/main/ProjectUICommands.java
+++ b/src/org/omegat/gui/main/ProjectUICommands.java
@@ -57,7 +57,6 @@
 import org.omegat.core.Core;
 import org.omegat.core.CoreEvents;
 import org.omegat.core.KnownException;
-import org.omegat.core.data.IProject;
 import org.omegat.core.data.ProjectFactory;
 import org.omegat.core.data.ProjectProperties;
 import org.omegat.core.events.IProjectEventListener;
@@ -796,7 +795,6 @@ public static void projectClose() {
         // commit the current entry first
         Core.getEditor().commitAndLeave();
 
-        final IProject project = Core.getProject();
         new SwingWorker<Void, Void>() {
             protected Void doInBackground() throws Exception {
                 Core.getMainWindow().showStatusMessageRB("MW_STATUS_SAVING");
diff --git a/test/src/org/omegat/core/data/TmxComplianceBase.java b/test/src/org/omegat/core/data/TmxComplianceBase.java
index f49105ff96..d794361b32 100644
--- a/test/src/org/omegat/core/data/TmxComplianceBase.java
+++ b/test/src/org/omegat/core/data/TmxComplianceBase.java
@@ -199,8 +199,7 @@ protected void align(IFilter filter, File sourceFile, String inCharset, File tra
         fc.setInEncoding(inCharset);
         fc.setOutEncoding(outCharset);
 
-        RealProject.AlignFilesCallback callback = new RealProject.AlignFilesCallback(props, filterMaster,
-                segmenter);
+        RealProject.AlignFilesCallback callback = new RealProject.AlignFilesCallback(props, segmenter, filterMaster);
 
         filter.alignFile(sourceFile, translatedFile, null, fc, callback);
 
diff --git a/test/src/org/omegat/languagetools/FalseFriendsTest.java b/test/src/org/omegat/languagetools/FalseFriendsTest.java
index d47ebbb645..8f32dfa81b 100644
--- a/test/src/org/omegat/languagetools/FalseFriendsTest.java
+++ b/test/src/org/omegat/languagetools/FalseFriendsTest.java
@@ -70,7 +70,7 @@ public Language getTargetLanguage() {
                 return new Language("pl");
             }
         };
-        Core.setProject(new NotLoadedProject(){
+        Core.setProject(new NotLoadedProject() {
             public boolean isProjectLoaded() {
                 return true;
             }