diff --git a/integraal/integraal-api/src/main/java/fr/boreal/api/high_level_api/Environment.java b/integraal/integraal-api/src/main/java/fr/boreal/api/high_level_api/Environment.java
index 6ca3b51c66d421a5f6314aca9d3722072ab467c8..5db6f3e0fdd7aba7c4b3afa3fbae4117d5f3a7cb 100644
--- a/integraal/integraal-api/src/main/java/fr/boreal/api/high_level_api/Environment.java
+++ b/integraal/integraal-api/src/main/java/fr/boreal/api/high_level_api/Environment.java
@@ -9,7 +9,6 @@ import java.util.HashSet;
 import fr.boreal.io.api.ParseException;
 import fr.boreal.io.dlgp.DlgpParser;
 import fr.boreal.io.dlgp.DlgpUtil;
-import fr.boreal.model.formula.api.FOFormula;
 import fr.boreal.model.kb.api.FactBase;
 import fr.boreal.model.kb.api.RuleBase;
 import fr.boreal.model.kb.impl.RuleBaseImpl;
diff --git a/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/CECommands.java b/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/CECommands.java
index 60e9ebdba58e295fd295b02a955cb4a634df88df..e2b2fbc8eda8cdc1684b7f41c1fd441ff4d17c47 100644
--- a/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/CECommands.java
+++ b/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/CECommands.java
@@ -1,5 +1,27 @@
 package fr.boreal.api.integraal_repl;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import org.jline.builtins.Less;
+import org.jline.builtins.Source;
+import org.jline.builtins.Source.InputStreamSource;
+import org.jline.reader.LineReader;
+
 import fr.boreal.api.integraal_repl.ComplexEnvironment.WriteMode;
 import fr.boreal.api.integraal_repl.IGCommands.InteGraalCommands;
 import fr.boreal.api.integraal_repl.IGRepl.PrintLevel;
@@ -13,23 +35,11 @@ import fr.boreal.model.rule.api.FORule;
 import fr.boreal.storage.builder.StorageBuilder;
 import fr.boreal.views.FederatedFactBase;
 import fr.boreal.views.builder.ViewBuilder;
-import org.jline.builtins.Less;
-import org.jline.builtins.Source;
-import org.jline.builtins.Source.InputStreamSource;
-import org.jline.reader.LineReader;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
 /**
  * An object that gathers REPL commands relating to the {@link ComplexEnvironment}.
  *
diff --git a/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/MySystemRegistry.java b/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/MySystemRegistry.java
index e09b3004881c496923aaaf0697d9a2ba5ae4b80b..4edc7f5aa2dbf803eda24449e96a8e5f70e9399e 100644
--- a/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/MySystemRegistry.java
+++ b/integraal/integraal-api/src/main/java/fr/boreal/api/integraal_repl/MySystemRegistry.java
@@ -8,6 +8,8 @@
  */
 package fr.boreal.api.integraal_repl;
 
+import static org.jline.keymap.KeyMap.ctrl;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -17,8 +19,20 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
@@ -31,12 +45,24 @@ import org.jline.builtins.ConfigurationPath;
 import org.jline.builtins.Options;
 import org.jline.builtins.Options.HelpException;
 import org.jline.builtins.Styles;
-import org.jline.console.*;
+import org.jline.console.ArgDesc;
+import org.jline.console.CmdDesc;
+import org.jline.console.CmdLine;
+import org.jline.console.CommandInput;
+import org.jline.console.CommandMethods;
+import org.jline.console.CommandRegistry;
+import org.jline.console.ConsoleEngine;
 import org.jline.console.ConsoleEngine.ExecutionResult;
+import org.jline.console.SystemRegistry;
 import org.jline.console.impl.Builtins;
 import org.jline.console.impl.ConsoleEngineImpl;
 import org.jline.console.impl.JlineCommandRegistry;
-import org.jline.reader.*;
+import org.jline.reader.Candidate;
+import org.jline.reader.Completer;
+import org.jline.reader.EndOfFileException;
+import org.jline.reader.LineReader;
+import org.jline.reader.ParsedLine;
+import org.jline.reader.Parser;
 import org.jline.reader.Parser.ParseContext;
 import org.jline.reader.impl.completer.AggregateCompleter;
 import org.jline.reader.impl.completer.ArgumentCompleter;
@@ -47,12 +73,15 @@ import org.jline.terminal.Attributes;
 import org.jline.terminal.Attributes.InputFlag;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
-import org.jline.utils.*;
+import org.jline.utils.AttributedString;
+import org.jline.utils.AttributedStringBuilder;
+import org.jline.utils.AttributedStyle;
+import org.jline.utils.Log;
+import org.jline.utils.OSUtils;
+import org.jline.utils.StyleResolver;
 
 import fr.boreal.api.integraal_repl.IGRepl.PrintLevel;
 
-import static org.jline.keymap.KeyMap.ctrl;
-
 /**
  * Aggregate command registries.
  *