diff --git a/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java b/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
index 495217fcd..39394d8c3 100644
--- a/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
+++ b/extensions/freebase/src/com/google/refine/freebase/ProtographTransposeExporter.java
@@ -40,12 +40,12 @@ import java.util.Properties;
 
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.WriterExporter;
-import com.google.refine.model.Project;
 import com.google.refine.freebase.protograph.Protograph;
 import com.google.refine.freebase.protograph.transpose.MqlwriteLikeTransposedNodeFactory;
 import com.google.refine.freebase.protograph.transpose.TransposedNodeFactory;
 import com.google.refine.freebase.protograph.transpose.Transposer;
 import com.google.refine.freebase.protograph.transpose.TripleLoaderTransposedNodeFactory;
+import com.google.refine.model.Project;
 
 abstract public class ProtographTransposeExporter implements WriterExporter {
     final protected String _contentType;
diff --git a/extensions/freebase/src/com/google/refine/freebase/commands/ExtendDataCommand.java b/extensions/freebase/src/com/google/refine/freebase/commands/ExtendDataCommand.java
index 8f09fae1d..7040f8784 100644
--- a/extensions/freebase/src/com/google/refine/freebase/commands/ExtendDataCommand.java
+++ b/extensions/freebase/src/com/google/refine/freebase/commands/ExtendDataCommand.java
@@ -38,9 +38,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.json.JSONObject;
 
 import com.google.refine.commands.EngineDependentCommand;
+import com.google.refine.freebase.operations.ExtendDataOperation;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
-import com.google.refine.freebase.operations.ExtendDataOperation;
 import com.google.refine.util.ParsingUtilities;
 
 public class ExtendDataCommand extends EngineDependentCommand {
diff --git a/extensions/freebase/src/com/google/refine/freebase/commands/ImportQADataCommand.java b/extensions/freebase/src/com/google/refine/freebase/commands/ImportQADataCommand.java
index 61c211c7e..8da76a4af 100644
--- a/extensions/freebase/src/com/google/refine/freebase/commands/ImportQADataCommand.java
+++ b/extensions/freebase/src/com/google/refine/freebase/commands/ImportQADataCommand.java
@@ -42,9 +42,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
+import com.google.refine.freebase.operations.ImportQADataOperation;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
-import com.google.refine.freebase.operations.ImportQADataOperation;
 import com.google.refine.process.Process;
 
 public class ImportQADataCommand extends Command {
diff --git a/extensions/freebase/src/com/google/refine/freebase/commands/PreviewProtographCommand.java b/extensions/freebase/src/com/google/refine/freebase/commands/PreviewProtographCommand.java
index e86b70c54..2f51075b8 100644
--- a/extensions/freebase/src/com/google/refine/freebase/commands/PreviewProtographCommand.java
+++ b/extensions/freebase/src/com/google/refine/freebase/commands/PreviewProtographCommand.java
@@ -46,10 +46,10 @@ import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.FilteredRows;
 import com.google.refine.commands.Command;
 import com.google.refine.freebase.protograph.Protograph;
-import com.google.refine.model.Project;
 import com.google.refine.freebase.protograph.transpose.MqlwriteLikeTransposedNodeFactory;
 import com.google.refine.freebase.protograph.transpose.Transposer;
 import com.google.refine.freebase.protograph.transpose.TripleLoaderTransposedNodeFactory;
+import com.google.refine.model.Project;
 import com.google.refine.util.ParsingUtilities;
 
 public class PreviewProtographCommand extends Command {
diff --git a/extensions/freebase/src/com/google/refine/freebase/commands/SaveProtographCommand.java b/extensions/freebase/src/com/google/refine/freebase/commands/SaveProtographCommand.java
index cde746534..cec61e92e 100644
--- a/extensions/freebase/src/com/google/refine/freebase/commands/SaveProtographCommand.java
+++ b/extensions/freebase/src/com/google/refine/freebase/commands/SaveProtographCommand.java
@@ -43,10 +43,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONObject;
 
 import com.google.refine.commands.Command;
+import com.google.refine.freebase.operations.SaveProtographOperation;
 import com.google.refine.freebase.protograph.Protograph;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
-import com.google.refine.freebase.operations.SaveProtographOperation;
 import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 
diff --git a/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java b/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
index 8fbc7f58a..aaf36d036 100644
--- a/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
+++ b/extensions/freebase/src/com/google/refine/freebase/model/changes/DataExtensionChange.java
@@ -48,6 +48,7 @@ import org.json.JSONObject;
 import org.json.JSONWriter;
 
 import com.google.refine.freebase.FreebaseType;
+import com.google.refine.freebase.model.recon.DataExtensionReconConfig;
 import com.google.refine.freebase.util.FreebaseDataExtensionJob.DataExtension;
 import com.google.refine.history.Change;
 import com.google.refine.model.Cell;
@@ -55,11 +56,10 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.ReconStats;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
-import com.google.refine.freebase.model.recon.DataExtensionReconConfig;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.Pool;
 
diff --git a/extensions/freebase/src/com/google/refine/freebase/model/recon/DataExtensionReconConfig.java b/extensions/freebase/src/com/google/refine/freebase/model/recon/DataExtensionReconConfig.java
index 9ba010ba9..f334fe0c3 100644
--- a/extensions/freebase/src/com/google/refine/freebase/model/recon/DataExtensionReconConfig.java
+++ b/extensions/freebase/src/com/google/refine/freebase/model/recon/DataExtensionReconConfig.java
@@ -47,7 +47,6 @@ import com.google.refine.model.Recon;
 import com.google.refine.model.Row;
 import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.ReconJob;
-import com.google.refine.freebase.model.recon.StrictReconConfig;
 
 public class DataExtensionReconConfig extends StrictReconConfig {
     final public FreebaseType type;
diff --git a/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java b/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
index 057356174..ec5fb670d 100644
--- a/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
+++ b/extensions/freebase/src/com/google/refine/freebase/model/recon/GuidBasedReconConfig.java
@@ -51,9 +51,9 @@ import org.json.JSONWriter;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.ReconJob;
 import com.google.refine.util.ParsingUtilities;
diff --git a/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java b/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
index fc2e7ef81..8cb4f68f3 100644
--- a/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
+++ b/extensions/freebase/src/com/google/refine/freebase/model/recon/IdBasedReconConfig.java
@@ -51,9 +51,9 @@ import org.json.JSONWriter;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.ReconJob;
 import com.google.refine.util.ParsingUtilities;
diff --git a/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java b/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
index fc67b3e63..59f91b93d 100644
--- a/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
+++ b/extensions/freebase/src/com/google/refine/freebase/model/recon/KeyBasedReconConfig.java
@@ -52,9 +52,9 @@ import com.google.refine.freebase.FreebaseTopic;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.ReconJob;
 import com.google.refine.util.ParsingUtilities;
diff --git a/extensions/freebase/src/com/google/refine/freebase/oauth/FreebaseProvider.java b/extensions/freebase/src/com/google/refine/freebase/oauth/FreebaseProvider.java
index 69328e946..994564156 100644
--- a/extensions/freebase/src/com/google/refine/freebase/oauth/FreebaseProvider.java
+++ b/extensions/freebase/src/com/google/refine/freebase/oauth/FreebaseProvider.java
@@ -35,9 +35,9 @@ package com.google.refine.freebase.oauth;
 
 import oauth.signpost.OAuthConsumer;
 
+import com.google.refine.freebase.util.FreebaseUtils;
 import com.google.refine.oauth.OAuthUtilities;
 import com.google.refine.oauth.Provider;
-import com.google.refine.freebase.util.FreebaseUtils;
 
 public class FreebaseProvider extends Provider {
     static private final String[] FREEBASE_OAUTH_INFO = { "#9202a8c04000641f80000000185352db" , "4561ee02279e6f04ebd88a1557e4292489380adf"};
diff --git a/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java b/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
index 83c7960b7..e9e17afe8 100644
--- a/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
+++ b/extensions/freebase/src/com/google/refine/freebase/operations/ExtendDataOperation.java
@@ -50,6 +50,7 @@ import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.FilteredRows;
 import com.google.refine.browsing.RowVisitor;
 import com.google.refine.freebase.FreebaseType;
+import com.google.refine.freebase.model.changes.DataExtensionChange;
 import com.google.refine.freebase.util.FreebaseDataExtensionJob;
 import com.google.refine.freebase.util.FreebaseDataExtensionJob.ColumnInfo;
 import com.google.refine.freebase.util.FreebaseDataExtensionJob.DataExtension;
@@ -61,7 +62,6 @@ import com.google.refine.model.Project;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
 import com.google.refine.model.changes.CellAtRow;
-import com.google.refine.freebase.model.changes.DataExtensionChange;
 import com.google.refine.operations.EngineDependentOperation;
 import com.google.refine.operations.OperationRegistry;
 import com.google.refine.process.LongRunningProcess;
diff --git a/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/Transposer.java b/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/Transposer.java
index 13aa502db..84474e4de 100644
--- a/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/Transposer.java
+++ b/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/Transposer.java
@@ -51,8 +51,8 @@ import com.google.refine.freebase.protograph.ValueNode;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
-import com.google.refine.model.Row;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.Row;
 
 public class Transposer {
     static public void transpose(
diff --git a/extensions/freebase/src/com/google/refine/freebase/util/FreebaseDataExtensionJob.java b/extensions/freebase/src/com/google/refine/freebase/util/FreebaseDataExtensionJob.java
index 56b3f944f..4ac421fb9 100644
--- a/extensions/freebase/src/com/google/refine/freebase/util/FreebaseDataExtensionJob.java
+++ b/extensions/freebase/src/com/google/refine/freebase/util/FreebaseDataExtensionJob.java
@@ -56,9 +56,9 @@ import org.json.JSONObject;
 import org.json.JSONWriter;
 
 import com.google.refine.freebase.FreebaseType;
+import com.google.refine.model.ReconCandidate;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
-import com.google.refine.model.ReconCandidate;
 
 public class FreebaseDataExtensionJob {
     static public class DataExtension {
diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand.java b/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand.java
index e1ebefb27..d58b0e440 100644
--- a/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand.java
+++ b/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.google.gdata.client.http.AuthSubUtil;
+
 import com.google.refine.commands.Command;
 
 /**
diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand2.java b/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand2.java
index fe98d038f..0c5690520 100644
--- a/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand2.java
+++ b/extensions/gdata/src/com/google/refine/extension/gdata/AuthorizeCommand2.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.google.gdata.client.http.AuthSubUtil;
+
 import com.google.refine.commands.Command;
 
 /**
diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/DeAuthorizeCommand.java b/extensions/gdata/src/com/google/refine/extension/gdata/DeAuthorizeCommand.java
index e05ca70f9..0bddc5a4e 100644
--- a/extensions/gdata/src/com/google/refine/extension/gdata/DeAuthorizeCommand.java
+++ b/extensions/gdata/src/com/google/refine/extension/gdata/DeAuthorizeCommand.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.google.gdata.client.http.AuthSubUtil;
+
 import com.google.refine.commands.Command;
 
 public class DeAuthorizeCommand extends Command {
diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/FusionTablesUrlRewriter.java b/extensions/gdata/src/com/google/refine/extension/gdata/FusionTablesUrlRewriter.java
index 5cd425e8e..71600cc78 100644
--- a/extensions/gdata/src/com/google/refine/extension/gdata/FusionTablesUrlRewriter.java
+++ b/extensions/gdata/src/com/google/refine/extension/gdata/FusionTablesUrlRewriter.java
@@ -40,6 +40,7 @@ import com.google.gdata.client.Service.GDataRequest;
 import com.google.gdata.client.Service.GDataRequest.RequestType;
 import com.google.gdata.util.ContentType;
 import com.google.gdata.util.ServiceException;
+
 import com.google.refine.importing.UrlRewriter;
 
 /**
diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java
index 285c81fc5..c4bd23cb9 100644
--- a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java
+++ b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java
@@ -46,6 +46,7 @@ import com.google.gdata.data.spreadsheet.SpreadsheetFeed;
 import com.google.gdata.data.spreadsheet.WorksheetEntry;
 import com.google.gdata.data.spreadsheet.WorksheetFeed;
 import com.google.gdata.util.ServiceException;
+
 import com.google.refine.ProjectMetadata;
 import com.google.refine.importers.TabularImportingParserBase;
 import com.google.refine.importing.ImportingJob;
diff --git a/main/src/com/google/refine/HttpResponder.java b/main/src/com/google/refine/HttpResponder.java
index 3ed70a883..3a01fbeed 100644
--- a/main/src/com/google/refine/HttpResponder.java
+++ b/main/src/com/google/refine/HttpResponder.java
@@ -6,8 +6,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.google.refine.RefineServlet;
-
 public interface HttpResponder {
     public void init(RefineServlet servlet);
 
diff --git a/main/src/com/google/refine/clustering/knn/kNNClusterer.java b/main/src/com/google/refine/clustering/knn/kNNClusterer.java
index b9db33b85..9c4499c57 100644
--- a/main/src/com/google/refine/clustering/knn/kNNClusterer.java
+++ b/main/src/com/google/refine/clustering/knn/kNNClusterer.java
@@ -41,9 +41,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/main/src/com/google/refine/commands/Command.java b/main/src/com/google/refine/commands/Command.java
index 7234d9a03..0ca367b71 100644
--- a/main/src/com/google/refine/commands/Command.java
+++ b/main/src/com/google/refine/commands/Command.java
@@ -50,10 +50,10 @@ import org.json.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.refine.RefineServlet;
 import com.google.refine.Jsonizable;
 import com.google.refine.ProjectManager;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineServlet;
 import com.google.refine.browsing.Engine;
 import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.Project;
diff --git a/main/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommand.java b/main/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommand.java
index 057c550df..13023b561 100644
--- a/main/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommand.java
+++ b/main/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommand.java
@@ -34,8 +34,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package com.google.refine.commands.expr;
 
 import java.io.IOException;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java b/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java
index 5715b47f0..e028d90b2 100644
--- a/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java
+++ b/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java
@@ -49,8 +49,8 @@ import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
-import com.google.refine.model.ReconStats;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.ReconStats;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.process.QuickHistoryEntryProcess;
diff --git a/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java b/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java
index 8c32f1965..05fa5408e 100644
--- a/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java
+++ b/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java
@@ -50,9 +50,9 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.ReconStats;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.process.QuickHistoryEntryProcess;
diff --git a/main/src/com/google/refine/commands/recon/ReconJudgeSimilarCellsCommand.java b/main/src/com/google/refine/commands/recon/ReconJudgeSimilarCellsCommand.java
index 8010c708c..a27317ce8 100644
--- a/main/src/com/google/refine/commands/recon/ReconJudgeSimilarCellsCommand.java
+++ b/main/src/com/google/refine/commands/recon/ReconJudgeSimilarCellsCommand.java
@@ -41,8 +41,8 @@ import com.google.refine.commands.EngineDependentCommand;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
-import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.ReconCandidate;
 import com.google.refine.operations.recon.ReconJudgeSimilarCellsOperation;
 
 public class ReconJudgeSimilarCellsCommand extends EngineDependentCommand {
diff --git a/main/src/com/google/refine/commands/row/GetRowsCommand.java b/main/src/com/google/refine/commands/row/GetRowsCommand.java
index 8a8ca74dc..887fe9222 100644
--- a/main/src/com/google/refine/commands/row/GetRowsCommand.java
+++ b/main/src/com/google/refine/commands/row/GetRowsCommand.java
@@ -46,11 +46,11 @@ import org.json.JSONObject;
 import org.json.JSONWriter;
 
 import com.google.refine.browsing.Engine;
+import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.browsing.FilteredRecords;
 import com.google.refine.browsing.FilteredRows;
 import com.google.refine.browsing.RecordVisitor;
 import com.google.refine.browsing.RowVisitor;
-import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.commands.Command;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
diff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java
index 4daf37d8f..2d76b0055 100644
--- a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java
+++ b/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java
@@ -35,8 +35,8 @@ package com.google.refine.commands.workspace;
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/main/src/com/google/refine/expr/functions/Cross.java b/main/src/com/google/refine/expr/functions/Cross.java
index d4a3e484c..4dd05b146 100644
--- a/main/src/com/google/refine/expr/functions/Cross.java
+++ b/main/src/com/google/refine/expr/functions/Cross.java
@@ -38,8 +38,8 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.google.refine.ProjectManager;
 import com.google.refine.InterProjectModel.ProjectJoin;
+import com.google.refine.ProjectManager;
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.WrappedCell;
 import com.google.refine.grel.ControlFunctionRegistry;
diff --git a/main/src/com/google/refine/grel/ControlFunctionRegistry.java b/main/src/com/google/refine/grel/ControlFunctionRegistry.java
index 66fc1e87f..4e615a3a8 100644
--- a/main/src/com/google/refine/grel/ControlFunctionRegistry.java
+++ b/main/src/com/google/refine/grel/ControlFunctionRegistry.java
@@ -35,8 +35,8 @@ package com.google.refine.grel;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.refine.expr.functions.Cross;
 import com.google.refine.expr.functions.FacetCount;
@@ -59,6 +59,12 @@ import com.google.refine.expr.functions.booleans.Or;
 import com.google.refine.expr.functions.date.DatePart;
 import com.google.refine.expr.functions.date.Inc;
 import com.google.refine.expr.functions.date.Now;
+import com.google.refine.expr.functions.html.HtmlAttr;
+import com.google.refine.expr.functions.html.HtmlText;
+import com.google.refine.expr.functions.html.InnerHtml;
+import com.google.refine.expr.functions.html.OwnText;
+import com.google.refine.expr.functions.html.ParseHtml;
+import com.google.refine.expr.functions.html.SelectHtml;
 import com.google.refine.expr.functions.math.ACos;
 import com.google.refine.expr.functions.math.ASin;
 import com.google.refine.expr.functions.math.ATan;
@@ -98,17 +104,12 @@ import com.google.refine.expr.functions.strings.Diff;
 import com.google.refine.expr.functions.strings.EndsWith;
 import com.google.refine.expr.functions.strings.Escape;
 import com.google.refine.expr.functions.strings.Fingerprint;
-import com.google.refine.expr.functions.html.HtmlAttr;
-import com.google.refine.expr.functions.html.HtmlText;
-import com.google.refine.expr.functions.html.InnerHtml;
-import com.google.refine.expr.functions.html.OwnText;
 import com.google.refine.expr.functions.strings.IndexOf;
 import com.google.refine.expr.functions.strings.LastIndexOf;
 import com.google.refine.expr.functions.strings.MD5;
 import com.google.refine.expr.functions.strings.Match;
 import com.google.refine.expr.functions.strings.NGram;
 import com.google.refine.expr.functions.strings.NGramFingerprint;
-import com.google.refine.expr.functions.html.ParseHtml;
 import com.google.refine.expr.functions.strings.ParseJson;
 import com.google.refine.expr.functions.strings.Partition;
 import com.google.refine.expr.functions.strings.Phonetic;
@@ -117,7 +118,6 @@ import com.google.refine.expr.functions.strings.Reinterpret;
 import com.google.refine.expr.functions.strings.Replace;
 import com.google.refine.expr.functions.strings.ReplaceChars;
 import com.google.refine.expr.functions.strings.SHA1;
-import com.google.refine.expr.functions.html.SelectHtml;
 import com.google.refine.expr.functions.strings.SmartSplit;
 import com.google.refine.expr.functions.strings.Split;
 import com.google.refine.expr.functions.strings.SplitByCharType;
diff --git a/main/src/com/google/refine/history/History.java b/main/src/com/google/refine/history/History.java
index d56b6da29..d00796887 100644
--- a/main/src/com/google/refine/history/History.java
+++ b/main/src/com/google/refine/history/History.java
@@ -49,9 +49,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.google.refine.RefineServlet;
 import com.google.refine.Jsonizable;
 import com.google.refine.ProjectManager;
+import com.google.refine.RefineServlet;
 import com.google.refine.model.Project;
 import com.google.refine.util.Pool;
 
diff --git a/main/src/com/google/refine/importers/ExcelImporter.java b/main/src/com/google/refine/importers/ExcelImporter.java
index 1b483200a..ee7976d24 100644
--- a/main/src/com/google/refine/importers/ExcelImporter.java
+++ b/main/src/com/google/refine/importers/ExcelImporter.java
@@ -59,8 +59,8 @@ import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
-import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.ReconCandidate;
 import com.google.refine.util.JSONUtilities;
 
 public class ExcelImporter extends TabularImportingParserBase {
diff --git a/main/src/com/google/refine/importers/RdfTripleImporter.java b/main/src/com/google/refine/importers/RdfTripleImporter.java
index cb0919729..052aa59a9 100644
--- a/main/src/com/google/refine/importers/RdfTripleImporter.java
+++ b/main/src/com/google/refine/importers/RdfTripleImporter.java
@@ -33,6 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.importers;
 
+import static org.jrdf.graph.AnyObjectNode.ANY_OBJECT_NODE;
+import static org.jrdf.graph.AnyPredicateNode.ANY_PREDICATE_NODE;
+import static org.jrdf.graph.AnySubjectNode.ANY_SUBJECT_NODE;
+
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,10 +56,6 @@ import org.jrdf.parser.ntriples.NTriplesParserFactory;
 import org.jrdf.util.ClosableIterable;
 import org.json.JSONObject;
 
-import static org.jrdf.graph.AnyObjectNode.ANY_OBJECT_NODE;
-import static org.jrdf.graph.AnyPredicateNode.ANY_PREDICATE_NODE;
-import static org.jrdf.graph.AnySubjectNode.ANY_SUBJECT_NODE;
-
 import com.google.refine.ProjectMetadata;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.importing.ImportingJob;
diff --git a/main/src/com/google/refine/importers/tree/XmlImportUtilities.java b/main/src/com/google/refine/importers/tree/XmlImportUtilities.java
index 9832cabc4..b237ba3d1 100644
--- a/main/src/com/google/refine/importers/tree/XmlImportUtilities.java
+++ b/main/src/com/google/refine/importers/tree/XmlImportUtilities.java
@@ -40,6 +40,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.servlet.ServletException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java
index f51b20647..826d540aa 100644
--- a/main/src/com/google/refine/importing/ImportingUtilities.java
+++ b/main/src/com/google/refine/importing/ImportingUtilities.java
@@ -74,13 +74,14 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ibm.icu.text.NumberFormat;
+
 import com.google.refine.ProjectManager;
 import com.google.refine.ProjectMetadata;
 import com.google.refine.importing.ImportingManager.Format;
 import com.google.refine.importing.UrlRewriter.Result;
 import com.google.refine.model.Project;
 import com.google.refine.util.JSONUtilities;
-import com.ibm.icu.text.NumberFormat;
 
 public class ImportingUtilities {
     final static protected Logger logger = LoggerFactory.getLogger("importing-utilities");
diff --git a/main/src/com/google/refine/io/FileHistoryEntryManager.java b/main/src/com/google/refine/io/FileHistoryEntryManager.java
index e9cb85047..adda311b0 100644
--- a/main/src/com/google/refine/io/FileHistoryEntryManager.java
+++ b/main/src/com/google/refine/io/FileHistoryEntryManager.java
@@ -36,11 +36,11 @@ package com.google.refine.io;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
+import java.io.Writer;
 import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
-import java.io.Writer;
 
 import org.json.JSONException;
 import org.json.JSONWriter;
diff --git a/main/src/com/google/refine/model/Project.java b/main/src/com/google/refine/model/Project.java
index 7d7a87353..e20fd496e 100644
--- a/main/src/com/google/refine/model/Project.java
+++ b/main/src/com/google/refine/model/Project.java
@@ -54,9 +54,9 @@ import org.json.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.refine.RefineServlet;
 import com.google.refine.ProjectManager;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineServlet;
 import com.google.refine.history.History;
 import com.google.refine.process.ProcessManager;
 import com.google.refine.util.ParsingUtilities;
diff --git a/main/src/com/google/refine/model/Row.java b/main/src/com/google/refine/model/Row.java
index 5284954c2..723ca5c3d 100644
--- a/main/src/com/google/refine/model/Row.java
+++ b/main/src/com/google/refine/model/Row.java
@@ -36,8 +36,8 @@ package com.google.refine.model;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonParser;
diff --git a/main/src/com/google/refine/model/recon/StandardReconConfig.java b/main/src/com/google/refine/model/recon/StandardReconConfig.java
index d9fcf2ca6..e067500a9 100644
--- a/main/src/com/google/refine/model/recon/StandardReconConfig.java
+++ b/main/src/com/google/refine/model/recon/StandardReconConfig.java
@@ -56,10 +56,10 @@ import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
-import com.google.refine.model.ReconCandidate;
-import com.google.refine.model.Row;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.RecordModel.RowDependency;
+import com.google.refine.model.Row;
 import com.google.refine.util.ParsingUtilities;
 
 public class StandardReconConfig extends ReconConfig {
diff --git a/main/src/com/google/refine/operations/OperationRegistry.java b/main/src/com/google/refine/operations/OperationRegistry.java
index c566fb5de..604439f11 100644
--- a/main/src/com/google/refine/operations/OperationRegistry.java
+++ b/main/src/com/google/refine/operations/OperationRegistry.java
@@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.operations;
 
-import java.lang.reflect.Method; 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/main/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperation.java b/main/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperation.java
index fe455a322..177aec84a 100644
--- a/main/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperation.java
@@ -49,8 +49,8 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
-import com.google.refine.model.Row;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.Row;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
diff --git a/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java b/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java
index 44993a201..b0bbe20a7 100644
--- a/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java
@@ -51,9 +51,9 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
diff --git a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java
index fba72ba4e..19b5be870 100644
--- a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java
@@ -49,8 +49,8 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
-import com.google.refine.model.Row;
 import com.google.refine.model.Recon.Judgment;
+import com.google.refine.model.Row;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
diff --git a/main/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperation.java b/main/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperation.java
index 84dbae15c..bc1a7f18b 100644
--- a/main/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperation.java
@@ -49,9 +49,9 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
diff --git a/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java b/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
index ecb94d33d..eb88c3728 100644
--- a/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
@@ -50,9 +50,9 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
+import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.Row;
-import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
diff --git a/main/src/com/google/refine/operations/row/DenormalizeOperation.java b/main/src/com/google/refine/operations/row/DenormalizeOperation.java
index c43e3cdef..744ad069d 100644
--- a/main/src/com/google/refine/operations/row/DenormalizeOperation.java
+++ b/main/src/com/google/refine/operations/row/DenormalizeOperation.java
@@ -45,9 +45,9 @@ import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
-import com.google.refine.model.Row;
 import com.google.refine.model.RecordModel.CellDependency;
 import com.google.refine.model.RecordModel.RowDependency;
+import com.google.refine.model.Row;
 import com.google.refine.model.changes.MassRowChange;
 import com.google.refine.operations.OperationRegistry;
 
diff --git a/main/src/com/google/refine/operations/row/RowReorderOperation.java b/main/src/com/google/refine/operations/row/RowReorderOperation.java
index aa521bdd4..00d4b62cf 100644
--- a/main/src/com/google/refine/operations/row/RowReorderOperation.java
+++ b/main/src/com/google/refine/operations/row/RowReorderOperation.java
@@ -42,9 +42,9 @@ import org.json.JSONObject;
 import org.json.JSONWriter;
 
 import com.google.refine.browsing.Engine;
+import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.browsing.RecordVisitor;
 import com.google.refine.browsing.RowVisitor;
-import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
diff --git a/main/src/com/google/refine/preference/PreferenceStore.java b/main/src/com/google/refine/preference/PreferenceStore.java
index 3c6beaa7d..d7d4b0638 100644
--- a/main/src/com/google/refine/preference/PreferenceStore.java
+++ b/main/src/com/google/refine/preference/PreferenceStore.java
@@ -44,8 +44,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
 
-import com.google.refine.RefineServlet;
 import com.google.refine.Jsonizable;
+import com.google.refine.RefineServlet;
 
 public class PreferenceStore implements Jsonizable {
     protected Map<String, Object> _prefs = new HashMap<String, Object>();
diff --git a/main/src/com/google/refine/util/Pool.java b/main/src/com/google/refine/util/Pool.java
index 7f9373ab2..b730543dc 100644
--- a/main/src/com/google/refine/util/Pool.java
+++ b/main/src/com/google/refine/util/Pool.java
@@ -44,14 +44,14 @@ import java.io.Writer;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.google.refine.RefineServlet;
 import com.google.refine.Jsonizable;
+import com.google.refine.RefineServlet;
 import com.google.refine.model.Recon;
 import com.google.refine.model.ReconCandidate;
 
diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
index 78c0e4d0a..5edfe6a2d 100644
--- a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
+++ b/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
@@ -33,6 +33,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.tests;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 
@@ -48,14 +56,6 @@ import com.google.refine.ProjectMetadata;
 import com.google.refine.model.Project;
 import com.google.refine.tests.model.ProjectStub;
 
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.never;
-
 public class ProjectManagerTests extends RefineTest {
     ProjectManagerStub pm;
     ProjectManagerStub SUT;
diff --git a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
index a6ea9dae7..f4aa7b6a8 100644
--- a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
@@ -33,17 +33,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.tests.exporters;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.times;
-
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
diff --git a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
index 9ab1d07ec..d45ebee22 100644
--- a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
@@ -33,15 +33,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.tests.exporters;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Properties;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Properties;
+
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
diff --git a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java b/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
index 18a9a9a74..9354462ca 100644
--- a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
+++ b/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
@@ -33,6 +33,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.tests.history;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.mockito.Mockito;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -41,11 +46,6 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.times;
-
 import com.google.refine.ProjectManager;
 import com.google.refine.ProjectMetadata;
 import com.google.refine.history.History;
diff --git a/server/src/com/google/refine/Refine.java b/server/src/com/google/refine/Refine.java
index aeec85ec5..47986e59a 100644
--- a/server/src/com/google/refine/Refine.java
+++ b/server/src/com/google/refine/Refine.java
@@ -65,6 +65,7 @@ import org.slf4j.LoggerFactory;
 
 import com.codeberry.jdatapath.DataPath;
 import com.codeberry.jdatapath.JDataPathSystem;
+
 import com.google.util.threads.ThreadPoolExecutorAdapter;
 
 /**