diff --git a/src/main/java/codegen/analysis/dataflow/DataFlowGraph.java b/src/main/java/codegen/analysis/dataflow/DataFlowGraph.java
index d15dd2e..bd7e6a1 100644
--- a/src/main/java/codegen/analysis/dataflow/DataFlowGraph.java
+++ b/src/main/java/codegen/analysis/dataflow/DataFlowGraph.java
@@ -96,7 +96,11 @@ public final class DataFlowGraph {
         for (DataFlowNode node : this.graph) {
             // Successors
             for (DataFlowNode succ : node.getSuccessors()) {
-                dot.append(node.getId()).append(" -> ").append(succ.getId()).append(";\n");
+                if (!dot.toString().contains(node.getId() + " -> " + succ.getId())) {
+                    // No duplicate arrows
+
+                    dot.append(node.getId()).append(" -> ").append(succ.getId()).append(";\n");
+                }
             }
 
             // Predecessors
diff --git a/src/main/java/codegen/flowgraph/FlowBasicBlock.java b/src/main/java/codegen/flowgraph/FlowBasicBlock.java
index 286ed87..d8c2811 100644
--- a/src/main/java/codegen/flowgraph/FlowBasicBlock.java
+++ b/src/main/java/codegen/flowgraph/FlowBasicBlock.java
@@ -141,6 +141,8 @@ public class FlowBasicBlock {
         return this.instructions.stream()
                                 .map(inst -> inst.toString().trim() + "\\n")
                                 .map(inst -> inst.replace("\"", "\\\""))
+                                .map(inst -> inst.replace("<", "less"))
+                                .map(inst -> inst.replace(">", "greater"))
                                 .collect(Collectors.joining());
     }
 
diff --git a/src/main/java/codegen/flowgraph/FlowGraph.java b/src/main/java/codegen/flowgraph/FlowGraph.java
index 947db97..740dd44 100644
--- a/src/main/java/codegen/flowgraph/FlowGraph.java
+++ b/src/main/java/codegen/flowgraph/FlowGraph.java
@@ -34,7 +34,6 @@ public class FlowGraph {
     public void addLabel(String label) {
         final FlowBasicBlock newBlock = new FlowBasicBlock(label);
 
-
         // Resolve missing successors/predecessors from jumps
         if (this.predecessorMap.containsKey(label)) {
             this.predecessorMap.get(label).addSuccessor(newBlock);
@@ -54,7 +53,7 @@ public class FlowGraph {
         final FlowBasicBlock newBlock = new FlowBasicBlock();
 
         if (!"goto".equals(jumpInstruction)) {
-            // Goto always jumps
+            // Goto always jumps, so we don't have a direct relation in order of the code
 
             newBlock.addPredecessor(this.getCurrentBlock()); // Obvious predecessor of new block
             this.getCurrentBlock().addSuccessor(newBlock); // Obvious successor of current block
@@ -160,6 +159,8 @@ public class FlowGraph {
            .append("node[shape=Mrecord]\n");
 
         for (FlowBasicBlock block : this.basicBlocks) {
+            System.out.println(block);
+            System.out.println("-".repeat(100));
             dot.append(block.getId())
                .append(" [label=\"{<f0> ")
                .append(this.basicBlocks.indexOf(block))
@@ -179,7 +180,11 @@ public class FlowGraph {
         for (FlowBasicBlock block : this.basicBlocks) {
             // Successors
             for (FlowBasicBlock succ : block.getSuccessorSet()) {
-                dot.append(block.getId()).append(" -> ").append(succ.getId()).append(";\n");
+                if (!dot.toString().contains(block.getId() + " -> " + succ.getId())) {
+                    // No duplicate arrows
+
+                    dot.append(block.getId()).append(" -> ").append(succ.getId()).append(";\n");
+                }
             }
 
             // Predecessors