diff --git a/src/main/java/tmltranslator/TMLCPSyntaxChecking.java b/src/main/java/tmltranslator/TMLCPSyntaxChecking.java
index acf7e2bc222c2c996cba9912fe0ea57cf0f107f3..c3348d1f17f361f8aa92c6f62222df29d3b4b6e7 100755
--- a/src/main/java/tmltranslator/TMLCPSyntaxChecking.java
+++ b/src/main/java/tmltranslator/TMLCPSyntaxChecking.java
@@ -381,7 +381,7 @@ public class TMLCPSyntaxChecking {
         for (TMLSDMessage message : messagesList) {
             String senderInstance = message.getSenderName();
             String receiverInstance = message.getReceiverName();
-            ArrayList<TMLAttribute> parametersList = message.getAttributes();
+            List<TMLAttribute> parametersList = message.getAttributes();
             for (TMLAttribute parameter : parametersList) {
                 //skip numerical parameters
                 if (!parameter.getName().matches("-?\\d+(\\.\\d+)?")) {
diff --git a/src/main/java/tmltranslator/tmlcp/TMLSDMessage.java b/src/main/java/tmltranslator/tmlcp/TMLSDMessage.java
index f30fb243d49dac410557bee9a15ab05b8e0fc7df..afc25dc2622d575af469f2f3cea9c2222162592f 100755
--- a/src/main/java/tmltranslator/tmlcp/TMLSDMessage.java
+++ b/src/main/java/tmltranslator/tmlcp/TMLSDMessage.java
@@ -37,15 +37,13 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
 package tmltranslator.tmlcp;
 
 import tmltranslator.TMLAttribute;
 import tmltranslator.TMLElement;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
 * Class TMLSDMessage
@@ -56,7 +54,7 @@ import java.util.ArrayList;
 public class TMLSDMessage extends TMLElement  {
 
 	//mind the difference between TMLAttribute and TMLAttribute!
-	private ArrayList<TMLAttribute> attributeList;	
+	private List<TMLAttribute> attributeList;	
 	private String senderName = "";
 	private String receiverName = "";
 	private int yCoord;
@@ -78,7 +76,7 @@ public class TMLSDMessage extends TMLElement  {
 	}*/
 
 	public TMLSDMessage( String _name, String _senderName, String _receiverName, int _yCoord,
-												Object _referenceObject, ArrayList<String> _params )	{
+												Object _referenceObject, List<String> _params )	{
 		super( _name, _referenceObject );
 		this.yCoord = _yCoord;
 		this.senderName = _senderName;
@@ -90,7 +88,7 @@ public class TMLSDMessage extends TMLElement  {
 	}
 	
 	// Constructor used for the TMLCPparser where in the TMLCP code there is no notion of yCoord and of referenceObject
-	public TMLSDMessage( String _name, String _senderName, String _receiverName, ArrayList<String> _params )	{
+	public TMLSDMessage( String _name, String _senderName, String _receiverName, List<String> _params )	{
 		super( _name, null );
 		this.yCoord = -1;
 		this.senderName = _senderName;
@@ -114,7 +112,7 @@ public class TMLSDMessage extends TMLElement  {
 			attributeList.add( _attribute );
 	}
 
-	public ArrayList<TMLAttribute> getAttributes()	{
+	public List<TMLAttribute> getAttributes()	{
 		return attributeList;
 	}
 
diff --git a/src/main/java/ui/tmlsd/TGConnectorMessageTMLSD.java b/src/main/java/ui/tmlsd/TGConnectorMessageTMLSD.java
index 4787407b2fdffde9cdc68c93fa3de1a9edef55d1..0d5942402ce3979716249e6f3a26ab134b9a97db 100755
--- a/src/main/java/ui/tmlsd/TGConnectorMessageTMLSD.java
+++ b/src/main/java/ui/tmlsd/TGConnectorMessageTMLSD.java
@@ -36,9 +36,6 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
 package ui.tmlsd;
 
 import myutil.GraphicLib;
@@ -50,8 +47,10 @@ import ui.util.IconManager;
 import ui.window.JDialogMultiStringCP;
 
 import javax.swing.*;
-import java.awt.*;
+
+import java.awt.Point;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -192,9 +191,9 @@ public abstract class TGConnectorMessageTMLSD extends TGConnector {
 		value += ")";
 	}
 
-	public ArrayList<String> getParams()	{
+	public List<String> getParams()	{
 
-		ArrayList<String> toBeReturned = new ArrayList<String>();
+		List<String> toBeReturned = new ArrayList<String>();
 		for( int i = 0; i < nParam; i++ )	{
 			if( ( params[i] != "" ) && ( params[i] != "null") )	{
 				toBeReturned.add( params[i] );