diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionParser.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionParser.java
index d0e1f26b9f..9b6f34f68d 100644
--- a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionParser.java
+++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionParser.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.TreeMap;
+import java.util.LinkedHashMap;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import org.jlab.logging.SplitLogManager;
@@ -19,9 +19,9 @@
  */
 public class OptionParser {
   
-    private Map<String,OptionValue> optionsDescriptors = new TreeMap<>();    
-    private Map<String,OptionValue>    requiredOptions = new TreeMap<>();
-    private Map<String,OptionValue>      parsedOptions = new TreeMap<>();
+    private Map<String,OptionValue> optionsDescriptors = new LinkedHashMap<>();    
+    private Map<String,OptionValue>    requiredOptions = new LinkedHashMap<>();
+    private Map<String,OptionValue>      parsedOptions = new LinkedHashMap<>();
     private Set<String>               overridenOptions = new HashSet<>();
     private List<String>               parsedInputList = new ArrayList<>();
     private String                             program = "undefined";
@@ -129,13 +129,7 @@ public String getUsageString(){
     }
     
     public void printUsage(){
-        System.out.println("\n\n");
-        System.out.println("*******************************************");
-        System.out.println("*      PROGRAM USAGE : by OptionParser    *");
-        System.out.println("*******************************************");
-        System.out.println("\n\n");
         System.out.println(this.getUsageString());
-        System.out.println("\n\n");
     }
    
     public void parse(String... args) {