diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
index e0ba755..996a2c4 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
@@ -1,11 +1,13 @@
 package generators;
 
-import models.algebra.IExpressionVisitor;
 import models.algebra.*;
 import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.JsonAccessor;
 import models.dataConstraintModel.JsonTerm;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * This class is a Java implementation of {@link IExpressionVisitor}
  * which holds and manages the actual method of implementation code generation
@@ -87,9 +89,9 @@
 		}
 		if (term.getArity() == 2 && term.getSymbol().isImplInfix()) {
 			if (implParamOrder == null) {
-				return new code.ast.MethodInvocation(term.getChildren().get(0).accept(this, sideEffects), term.getSymbol().toImplementation(), java.util.List.of(term.getChildren().get(1).accept(this, sideEffects)));
+				return new code.ast.MethodInvocation(term.getChildren().get(0).accept(this, sideEffects), term.getSymbol().toImplementation(), List.of(term.getChildren().get(1).accept(this, sideEffects)));
 			} else {
-				return new code.ast.MethodInvocation(term.getChildren().get(implParamOrder[0]).accept(this, sideEffects), term.getSymbol().toImplementation(), java.util.List.of(term.getChildren().get(implParamOrder[1]).accept(this, sideEffects)));
+				return new code.ast.MethodInvocation(term.getChildren().get(implParamOrder[0]).accept(this, sideEffects), term.getSymbol().toImplementation(), List.of(term.getChildren().get(implParamOrder[1]).accept(this, sideEffects)));
 			}
 		}
 		if ((term.getArity() >= 1 || term.getArity() == -1) && term.getSymbol().isImplMethod()) {
@@ -102,28 +104,28 @@
 				} else {
 					invocation = new code.ast.MethodInvocation(term.getSymbol().toImplementation());
 				}
-				java.util.List<code.ast.Expression> args = new java.util.ArrayList<>();
+				List<code.ast.Expression> args = new ArrayList<>();
 				for (int i = 1; i < term.getChildren().size(); i++) {
 					Expression e = term.getChildren().get(i);
 					args.add(e.accept(this, sideEffects));
 				}
 				invocation.setArguments(args);
 				if (term.getSymbol().isImplWithSideEffect()) {
-					sideEffects[0] = sideEffects[0] + invocation.toString() + ";\n";
+					sideEffects[0] = sideEffects[0] + invocation + ";\n";
 					return receiver;
 				}
 				return invocation;
 			} else {
 				code.ast.Expression receiver = term.getChildren().get(implParamOrder[0]).accept(this, sideEffects);
 				code.ast.MethodInvocation invocation = new code.ast.MethodInvocation(receiver, term.getSymbol().toImplementation());
-				java.util.List<code.ast.Expression> args = new java.util.ArrayList<>();
+				List<code.ast.Expression> args = new ArrayList<>();
 				for (int i = 1; i < term.getChildren().size(); i++) {
 					Expression e = term.getChildren().get(implParamOrder[i]);
 					args.add(e.accept(this, sideEffects));
 				}
 				invocation.setArguments(args);
 				if (term.getSymbol().isImplWithSideEffect()) {
-					sideEffects[0] = sideEffects[0] + invocation.toString() + ";\n";
+					sideEffects[0] = sideEffects[0] + invocation + ";\n";
 					return receiver;
 				}
 				return invocation;
@@ -131,7 +133,7 @@
 		} else {
 			if (implParamOrder == null) {
 				code.ast.MethodInvocation invocation = new code.ast.MethodInvocation(term.getSymbol().toImplementation());
-				java.util.List<code.ast.Expression> args = new java.util.ArrayList<>();
+				List<code.ast.Expression> args = new ArrayList<>();
 				for (Expression e : term.getChildren()) {
 					args.add(e.accept(this, sideEffects));
 				}
@@ -139,7 +141,7 @@
 				return invocation;
 			} else {
 				code.ast.MethodInvocation invocation = new code.ast.MethodInvocation(term.getSymbol().toImplementation());
-				java.util.List<code.ast.Expression> args = new java.util.ArrayList<>();
+				List<code.ast.Expression> args = new ArrayList<>();
 				for (int i = 0; i < term.getChildren().size(); i++) {
 					Expression e = term.getChildren().get(implParamOrder[i]);
 					args.add(e.accept(this, sideEffects));
@@ -190,7 +192,7 @@
 	public code.ast.Expression visit(JsonAccessor jsonAccessor, String[] sideEffects) {
 		if (jsonAccessor.getSymbol().equals(DataConstraintModel.dotParam)) {
 			code.ast.MethodInvocation invocation = new code.ast.MethodInvocation(jsonAccessor.getChildren().get(0).accept(this, sideEffects), jsonAccessor.getSymbol().toImplementation());
-			invocation.setArguments(java.util.List.of(jsonAccessor.getChildren().get(1).accept(this, sideEffects)));
+			invocation.setArguments(List.of(jsonAccessor.getChildren().get(1).accept(this, sideEffects)));
 			return invocation;
 		}
 		return visit((Term) jsonAccessor, sideEffects);