diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/App.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/App.java
index 96b4580..1c21936 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/App.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/App.java
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
 import java.util.concurrent.Callable;
 
 import io.process.analytics.tools.bpmn.generator.BPMNLayoutGenerator.ExportType;
@@ -54,7 +53,6 @@ public class App implements Callable<Integer> {
     private File[] inputFiles;
 
     public static void main(String[] args) throws Exception {
-
         int exitCode = runApp(args);
         System.exit(exitCode);
     }
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/BPMNLayoutGenerator.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/BPMNLayoutGenerator.java
index 7252ece..8848c2a 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/BPMNLayoutGenerator.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/BPMNLayoutGenerator.java
@@ -3,9 +3,6 @@
 import static io.process.analytics.tools.bpmn.generator.export.BPMNExporter.defaultBpmnExporter;
 import static io.process.analytics.tools.bpmn.generator.internal.BpmnInOut.defaultBpmnInOut;
 
-import java.io.File;
-import java.io.IOException;
-
 import io.process.analytics.tools.bpmn.generator.algo.ShapeLayouter;
 import io.process.analytics.tools.bpmn.generator.algo.ShapeSorter;
 import io.process.analytics.tools.bpmn.generator.converter.BpmnToAlgoModelConverter;
@@ -13,7 +10,6 @@
 import io.process.analytics.tools.bpmn.generator.export.SVGExporter;
 import io.process.analytics.tools.bpmn.generator.input.CSVtoBPMN;
 import io.process.analytics.tools.bpmn.generator.internal.BpmnInOut;
-import io.process.analytics.tools.bpmn.generator.internal.FileUtils;
 import io.process.analytics.tools.bpmn.generator.internal.generated.model.TDefinitions;
 import io.process.analytics.tools.bpmn.generator.model.Diagram;
 import io.process.analytics.tools.bpmn.generator.model.Grid;
@@ -93,20 +89,17 @@ private String exportToSvg(LayoutSortedDiagram diagram) {
 
 
     private String export(LayoutSortedDiagram layout, ExportType exportType) {
-        switch (exportType) {
-            case ASCII:
-                return exportToAscii(layout);
-            case BPMN:
-                return exportToBpmn(layout);
-            case SVG:
-                return exportToSvg(layout);
-            default:
-                throw new IllegalStateException("Unexpected Export Type: " + exportType);
-        }
+        return switch (exportType) {
+            case ASCII -> exportToAscii(layout);
+            case BPMN -> exportToBpmn(layout);
+            case SVG -> exportToSvg(layout);
+            default -> throw new IllegalStateException("Unexpected Export Type: " + exportType);
+        };
     }
 
     @RequiredArgsConstructor
     @Getter
+    // TODO switch to record
     public static class LayoutSortedDiagram {
 
         private final TDefinitions originalDefinitions;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeLayouter.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeLayouter.java
index a3b6d3c..767f629 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeLayouter.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeLayouter.java
@@ -4,7 +4,6 @@
 import static io.process.analytics.tools.bpmn.generator.model.Position.position;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import io.process.analytics.tools.bpmn.generator.model.Edge;
 import io.process.analytics.tools.bpmn.generator.model.Grid;
@@ -22,6 +21,7 @@ public Grid layout(Diagram diagram) {
         for (Shape shape : diagram.getShapes()) {
             Position positionOfCurrentShape = positionShape(diagram, grid, shape);
             putOnGrid(grid, positionOfCurrentShape);
+            // TODO check usage of supplier, intellij says it is deprecated
             log.debug("Adding {}:\n{}", shape::getName, () -> toAscii(grid));
             addRowsWhenShapeIsASplit(diagram, grid, shape, positionOfCurrentShape);
         }
@@ -76,8 +76,8 @@ private Position positionShape(Diagram diagram, Grid grid, Shape shape) {
     private void compactGrid(Grid grid) {
         int i = 0;
         while (i < grid.getLastRowIndex()) {
-            List<Integer> currentRow = grid.getRow(i).stream().map(Position::getX).collect(Collectors.toList());
-            List<Integer> nextRow = grid.getRow(i + 1).stream().map(Position::getX).collect(Collectors.toList());
+            List<Integer> currentRow = grid.getRow(i).stream().map(Position::getX).toList();
+            List<Integer> nextRow = grid.getRow(i + 1).stream().map(Position::getX).toList();
 
             boolean currentRowCanBeMovedBelow = true;
             for (Integer shapeIndexInCurrentRow : currentRow) {
@@ -109,7 +109,7 @@ private Position addStartShape(Grid grid, Shape shape) {
     private Position addSplit(Grid grid, Shape shape, String previousShapeID, List<Edge> outgoingEdgesOfPreviousShape) {
         Position previousShapePosition = grid.getPosition(previousShapeID);
         int numberOfShapesInTheSplit = outgoingEdgesOfPreviousShape.size();
-        int indexOfCurrentShape = outgoingEdgesOfPreviousShape.stream().map(Edge::getTo).collect(Collectors.toList()).indexOf(shape.getId());
+        int indexOfCurrentShape = outgoingEdgesOfPreviousShape.stream().map(Edge::getTo).toList().indexOf(shape.getId());
         //put element right to the split vertically distributed according to the index
         int relativeYPosition;
         if (numberOfShapesInTheSplit % 2 == 0 && indexOfCurrentShape >= numberOfShapesInTheSplit / 2) {
@@ -124,7 +124,7 @@ private Position addSplit(Grid grid, Shape shape, String previousShapeID, List<E
     private Position addJoin(Grid grid, Shape shape, List<Edge> incomingEdges) {
         //first implementation: middle of elements it joins
         // later we should also try yo find the split to align it to that if possible
-        List<Position> positions = incomingEdges.stream().map(Edge::getFrom).map(grid::getPosition).collect(Collectors.toList());
+        List<Position> positions = incomingEdges.stream().map(Edge::getFrom).map(grid::getPosition).toList();
         int xMax = positions.stream().map(Position::getX).reduce(0, Math::max);
         int yMax = positions.stream().map(Position::getY).reduce(0, Math::max);
         int yMin = positions.stream().map(Position::getY).reduce(Integer.MAX_VALUE, Math::min);
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeSorter.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeSorter.java
index ba15d8f..adf6ad5 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeSorter.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/algo/ShapeSorter.java
@@ -35,7 +35,6 @@
  */
 public class ShapeSorter {
 
-
     /**
      * sort nodes of a diagram in topological order
      *
@@ -78,12 +77,9 @@ private boolean isAJoinInOriginalDiagram(Diagram diagram, Shape currentElement)
     }
 
     private Diagram doSort(Diagram diagram) {
-        List<Shape> shapeToSort = new ArrayList<>();
-        List<Edge> remainingEdges = new ArrayList<>();
-        List<Edge> finalEdges = new ArrayList<>();
-        shapeToSort.addAll(diagram.getShapes());
-        remainingEdges.addAll(diagram.getEdges());
-        finalEdges.addAll(diagram.getEdges());
+        List<Shape> shapeToSort = new ArrayList<>(diagram.getShapes());
+        List<Edge> remainingEdges = new ArrayList<>(diagram.getEdges());
+        List<Edge> finalEdges = new ArrayList<>(diagram.getEdges());
         List<Join> joins = findAllJoins(shapeToSort, remainingEdges);
 
         Diagram.DiagramBuilder sortedDiagram = Diagram.builder();
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/input/CSVtoBPMN.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/input/CSVtoBPMN.java
index 118f454..31d280e 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/input/CSVtoBPMN.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/input/CSVtoBPMN.java
@@ -61,37 +61,7 @@ private List<TFlowNode> getFlowNodeElements(String nodes) {
                 continue;
             }
             String[] node = line.split(",");
-            String type = removeEnclosingDoubleQuote(node[3]);
-            TFlowNode flowNode;
-            switch (type) {
-                case "start_event":
-                    flowNode = new TStartEvent();
-                    break;
-                case "end_event":
-                    flowNode = new TEndEvent();
-                    break;
-                case "gateway":
-                    flowNode = new TParallelGateway();
-                    break;
-                case "parallel_gateway":
-                    flowNode = new TParallelGateway();
-                    break;
-                case "exclusive_gateway":
-                    flowNode = new TExclusiveGateway();
-                    break;
-                case "inclusive_gateway":
-                    flowNode = new TInclusiveGateway();
-                    break;
-                case "user_task":
-                    flowNode = new TUserTask();
-                    break;
-                case "service_task":
-                    flowNode = new TServiceTask();
-                    break;
-                case "task":
-                default:
-                    flowNode = new TTask();
-            }
+            TFlowNode flowNode = gettFlowNode(node);
             flowNode.setName(removeEnclosingDoubleQuote(node[2]));
 
             String originalId = node[1];
@@ -107,6 +77,21 @@ private List<TFlowNode> getFlowNodeElements(String nodes) {
         return flowElements;
     }
 
+    private static TFlowNode gettFlowNode(String[] node) {
+        String type = removeEnclosingDoubleQuote(node[3]);
+        TFlowNode flowNode = switch (type) {
+            case "start_event" -> new TStartEvent();
+            case "end_event" -> new TEndEvent();
+            case "gateway", "parallel_gateway" -> new TParallelGateway();
+            case "exclusive_gateway" -> new TExclusiveGateway();
+            case "inclusive_gateway" -> new TInclusiveGateway();
+            case "user_task" -> new TUserTask();
+            case "service_task" -> new TServiceTask();
+            default -> new TTask();
+        };
+        return flowNode;
+    }
+
     private void assignIncomingAndOutgoingReferences(List<TFlowNode> flowNodeElements) {
         for (TFlowNode flowNode : flowNodeElements) {
             EdgeRelation edgeRelation = this.shapeRelations.get(flowNode.getId());
@@ -191,7 +176,7 @@ private static boolean isNumeric(String s) {
     private static class EdgeRelation {
 
         public final List<String> incoming = new ArrayList<>();
-        public final List<String> outgoing = new ArrayList<>();;
+        public final List<String> outgoing = new ArrayList<>();
 
     }
 
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnInOut.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnInOut.java
index f8bf4f5..8a6f0b6 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnInOut.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnInOut.java
@@ -15,7 +15,6 @@
  */
 package io.process.analytics.tools.bpmn.generator.internal;
 
-import static io.process.analytics.tools.bpmn.generator.internal.FileUtils.createParents;
 import static io.process.analytics.tools.bpmn.generator.internal.FileUtils.fileContent;
 
 import java.io.File;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java
index ae90aa0..9253acf 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java
@@ -31,6 +31,8 @@
  * Helper to access to the BPMN semantic part
  */
 @RequiredArgsConstructor
+// TODO switch to record
+// TODO lombok getter on class
 public class Semantic {
 
     @NonNull
@@ -42,18 +44,12 @@ public static String getId(Object object) {
         return ((TBaseElement) object).getId();
     }
 
-    public List<TParticipant> getParticipants() {
-        return getCollaboration()
-                .map(TCollaboration::getParticipant)
-                .orElseGet(Collections::emptyList);
-    }
-
     public Optional<TCollaboration> getCollaboration() {
         List<TCollaboration> collaborations = definitions.getRootElement().stream()
                 .map(JAXBElement::getValue)
                 .filter(TCollaboration.class::isInstance)
                 .map(TCollaboration.class::cast)
-                .collect(Collectors.toList());
+                .toList();
 
         // TODO check at most 1 otherwise error
         // TODO refactor into a more functional way
@@ -106,9 +102,7 @@ public void add(TProcess process) {
 
     public static void addFlowNodes(TProcess process, Collection<TFlowNode> flowElements) {
         flowElements.stream()
-                .map(f -> {
-                    return new JAXBElement<>(bpmnElementQName(f), TFlowNode.class, null, f);
-                })
+                .map(f -> new JAXBElement<>(bpmnElementQName(f), TFlowNode.class, null, f))
                 .forEach(f -> process.getFlowElement().add(f));
     }
 
@@ -123,7 +117,7 @@ private static QName bpmnElementQName(String bpmnElement) {
     }
 
     //TODO add other type of flow node elements
-    private static final Map<Class<? extends TFlowNode>, String> bpmnElementBindings = new HashMap<Class<? extends TFlowNode>, String>() {{
+    private static final Map<Class<? extends TFlowNode>, String> bpmnElementBindings = new HashMap<>() {{
         put(TParallelGateway.class, "parallelGateway");
         put(TInclusiveGateway.class, "inclusiveGateway");
         put(TExclusiveGateway.class, "exclusiveGateway");
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java
index 4e5536f..077b4e0 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java
@@ -15,7 +15,6 @@
  */
 package io.process.analytics.tools.bpmn.generator.internal;
 
-import java.io.File;
 import java.io.StringReader;
 import java.io.StringWriter;
 
@@ -56,6 +55,7 @@ private Marshaller createMarshaller() throws JAXBException {
         } catch(PropertyException e) {
             // In case another JAXB implementation is used
             // do not stop processing, namespace prefixes will be generated automatically in that case
+            // TODO switch to logger
             e.printStackTrace();
         }
         return marshaller;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Grid.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Grid.java
index ee0836f..08c217e 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Grid.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Grid.java
@@ -1,13 +1,12 @@
 package io.process.analytics.tools.bpmn.generator.model;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
  *
- * Represent a grid with coordinate as follow
+ * Represent a grid with coordinate as follows
  *
  * <pre>
  *  + ➞ x
@@ -15,6 +14,7 @@
  *  y
  * </pre>
  */
+// TODO use lombok getter?
 public class Grid {
 
     private final List<Position> positions = new ArrayList<>();
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Shape.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Shape.java
index a8f65b9..64a4b76 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Shape.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/Shape.java
@@ -24,6 +24,7 @@
 @Data
 @Builder(toBuilder = true)
 @RequiredArgsConstructor
+// TODO switch to record
 public class Shape {
 
     private final String id; // the bpmnElement id
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/ShapeType.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/ShapeType.java
index 5324ec9..3f89aa8 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/ShapeType.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/ShapeType.java
@@ -16,5 +16,5 @@
 package io.process.analytics.tools.bpmn.generator.model;
 
 public enum ShapeType {
-    ACTIVITY, EVENT, GATEWAY;
+    ACTIVITY, EVENT, GATEWAY
 }
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayDimension.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayDimension.java
index e207ba0..a550a7b 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayDimension.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayDimension.java
@@ -15,6 +15,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
+// TODO switch to record
 public class DisplayDimension {
 
     public final int x;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayEdge.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayEdge.java
index 7240a3b..a25a0a3 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayEdge.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayEdge.java
@@ -12,7 +12,6 @@
  */
 package io.process.analytics.tools.bpmn.generator.model.display;
 
-import io.process.analytics.tools.bpmn.generator.model.display.DisplayPoint;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
 
@@ -20,6 +19,7 @@
 
 @RequiredArgsConstructor
 @Builder
+// TODO switch to record
 public class DisplayEdge {
 
     public final String bpmnElementId;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayFlowNode.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayFlowNode.java
index d103af2..c14517b 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayFlowNode.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayFlowNode.java
@@ -18,6 +18,7 @@
 
 @RequiredArgsConstructor
 @Builder
+// TODO switch to record
 public class DisplayFlowNode {
 
     public final String bpmnElementId;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayLabel.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayLabel.java
index 268298d..5fc61d4 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayLabel.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayLabel.java
@@ -15,6 +15,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
+// TODO switch to record
 public class DisplayLabel {
 
     public final String text; // for non BPMN exporters only
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayModel.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayModel.java
index ee0a309..1ec7440 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayModel.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayModel.java
@@ -20,6 +20,7 @@
 
 @RequiredArgsConstructor
 @Builder
+// TODO switch to record
 public class DisplayModel {
     public final int width;
     public final int height;
diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayPoint.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayPoint.java
index 9494885..e653037 100644
--- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayPoint.java
+++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/model/display/DisplayPoint.java
@@ -17,6 +17,7 @@
 
 @RequiredArgsConstructor
 @ToString
+// TODO switch to record
 public class DisplayPoint {
 
     public final int x;