diff --git a/src/main/java/avatartranslator/AvatarBinaryGuard.java b/src/main/java/avatartranslator/AvatarBinaryGuard.java
index 0c473aaafd6a07fc8d97882b40119766dab8e0b3..070ef547e6d468ee21a29086df8692bc6c45fdd1 100644
--- a/src/main/java/avatartranslator/AvatarBinaryGuard.java
+++ b/src/main/java/avatartranslator/AvatarBinaryGuard.java
@@ -36,10 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
 package avatartranslator;
 
-import java.util.HashMap;
+import java.util.Map;
 
 /**
    * Class AvatarBinaryGuard
@@ -81,7 +80,7 @@ public class AvatarBinaryGuard extends AvatarComposedGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
         this.guardA.replaceAttributes (attributesMapping);
         this.guardB.replaceAttributes (attributesMapping);
     }
diff --git a/src/main/java/avatartranslator/AvatarComposedGuard.java b/src/main/java/avatartranslator/AvatarComposedGuard.java
index 7115e79a910af48a070ef41553a2523e1dcd2df1..e414be224d870cdfbeba99eca46ec5ef1fd97c36 100644
--- a/src/main/java/avatartranslator/AvatarComposedGuard.java
+++ b/src/main/java/avatartranslator/AvatarComposedGuard.java
@@ -36,10 +36,6 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
 /**
@@ -49,7 +45,8 @@ package avatartranslator;
    * @author Florian LUGOU
  */
 public abstract class AvatarComposedGuard extends AvatarGuard {
-    public AvatarComposedGuard getOpposite () {
+    
+	public AvatarComposedGuard getOpposite () {
         return new AvatarUnaryGuard ("not", "(", ")", this);
     }
 
diff --git a/src/main/java/avatartranslator/AvatarConstantGuard.java b/src/main/java/avatartranslator/AvatarConstantGuard.java
index d6a3591d65d98925ac9516ac3f1e80646718d3fc..d19b4d8640a8c027e8c6612223a8ff18966f09ed 100644
--- a/src/main/java/avatartranslator/AvatarConstantGuard.java
+++ b/src/main/java/avatartranslator/AvatarConstantGuard.java
@@ -36,14 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-import java.util.HashMap;
-
+import java.util.Map;
 
 /**
  * An AvatarConstantGuard is an {@link AvatarSimpleGuard} that is of the form:
@@ -73,5 +68,5 @@ public class AvatarConstantGuard extends AvatarSimpleGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
 }
diff --git a/src/main/java/avatartranslator/AvatarGuard.java b/src/main/java/avatartranslator/AvatarGuard.java
index e02812cb685d04ecc3d2b0aab1cd2aebfd718949..69963b20e73ae0b64c8765adf635b374a2cf0481 100644
--- a/src/main/java/avatartranslator/AvatarGuard.java
+++ b/src/main/java/avatartranslator/AvatarGuard.java
@@ -36,17 +36,13 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
+import java.util.Map;
+
 import myutil.Conversion;
 import myutil.TraceManager;
 
-import java.util.HashMap;
-
 /**
  * Class AvatarGuard
  * Creation: 16/09/2015
@@ -250,5 +246,5 @@ public abstract class AvatarGuard {
      * @param attributesMapping
      *      The mapping used to replace the attributes of the guard. All the attributes of the block should be present as keys.
      */
-    public abstract void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
+    public abstract void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping);
 }
diff --git a/src/main/java/avatartranslator/AvatarGuardElse.java b/src/main/java/avatartranslator/AvatarGuardElse.java
index 61020187adf847de61777dda0892b0622dba420b..f1135dd8e22ac1a088af4927d738ddd60a0145b5 100644
--- a/src/main/java/avatartranslator/AvatarGuardElse.java
+++ b/src/main/java/avatartranslator/AvatarGuardElse.java
@@ -36,14 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-import java.util.HashMap;
-
+import java.util.Map;
 
 /**
  * An AvatarGuardElse is an {@link AvatarGuard} that is of the form:
@@ -100,5 +95,5 @@ public class AvatarGuardElse extends AvatarGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
 }
diff --git a/src/main/java/avatartranslator/AvatarGuardEmpty.java b/src/main/java/avatartranslator/AvatarGuardEmpty.java
index 15adf7e6103e4858db7686b2bfc76bea6e8efa96..6e5cdd08edf654cdb97b6f4bf2b82a8fcd7236dc 100644
--- a/src/main/java/avatartranslator/AvatarGuardEmpty.java
+++ b/src/main/java/avatartranslator/AvatarGuardEmpty.java
@@ -36,13 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -52,7 +48,8 @@ import java.util.HashMap;
  * @author Florian LUGOU
  */
 public class AvatarGuardEmpty extends AvatarGuard {
-    public AvatarGuardEmpty () {
+    
+	public AvatarGuardEmpty () {
     }
 
     public boolean isGuarded () {
@@ -69,5 +66,5 @@ public class AvatarGuardEmpty extends AvatarGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
 }
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuard.java b/src/main/java/avatartranslator/AvatarSimpleGuard.java
index c45a25e9efc6e98bef828af42729f0112a91b431..7b2ea465a8386035a66cf4df70642f977e57fd99 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuard.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuard.java
@@ -36,13 +36,8 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-
 /**
  * An AvatarSimpleGuard is an {@link AvatarGuard} that is of the form:
  * {@link AvatarTerm} binaryOp {@link AvatarTerm} or simply {@link AvatarTerm}, or else
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
index 2054de47883a288f756295951abef95d8b160b3f..d6aa10cb0a4c0669e59db53270b843d7a6f2a4e4 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
@@ -36,14 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-import java.util.HashMap;
-
+import java.util.Map;
 
 /**
  * An AvatarSimpleGuardDuo is an {@link AvatarSimpleGuard} that is of the form:
@@ -85,7 +80,7 @@ public class AvatarSimpleGuardDuo extends AvatarSimpleGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
         if (this.termA instanceof AvatarAttribute)
         {
             this.termA = attributesMapping.get(this.termA);
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
index f7ab27ac03485284847468cddebfd364321901ec..58aeefdd90e87cf1c8dfa12158c546ffab28903d 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
@@ -41,10 +41,9 @@
    * Class AvatarSimpleGuardMono
  */
 
-
 package avatartranslator;
 
-import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -75,10 +74,11 @@ public class AvatarSimpleGuardMono extends AvatarSimpleGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
-        for (AvatarAttribute attr: attributesMapping.keySet())
-        {
-        }
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
+//        for (AvatarAttribute attr: attributesMapping.keySet())
+//        {
+//        }
+        
         if (this.term instanceof AvatarAttribute)
         {
             this.term = attributesMapping.get(this.term);
diff --git a/src/main/java/avatartranslator/AvatarUnaryGuard.java b/src/main/java/avatartranslator/AvatarUnaryGuard.java
index 21c188478311f191a40529d9c0ba5d695ff3d85f..ed463e1d253e776a92bfb6eeded0ee038867ad28 100644
--- a/src/main/java/avatartranslator/AvatarUnaryGuard.java
+++ b/src/main/java/avatartranslator/AvatarUnaryGuard.java
@@ -36,13 +36,9 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
-
 package avatartranslator;
 
-import java.util.HashMap;
+import java.util.Map;
 
 /**
    * Class AvatarUnaryGuard
@@ -98,7 +94,7 @@ public class AvatarUnaryGuard extends AvatarComposedGuard {
     }
 
     @Override
-    public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+    public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
         this.guard.replaceAttributes (attributesMapping);
     }
 }