diff --git a/b_asic/research/interleaver.py b/b_asic/research/interleaver.py
index 77763c025b546d770ffe0894fd22fb80d5dacfe6..1386ae7d30bf4900070234f55373124e1c0f3d94 100644
--- a/b_asic/research/interleaver.py
+++ b/b_asic/research/interleaver.py
@@ -46,18 +46,18 @@ def generate_random_interleaver(
     ProcessCollection
 
     """
-    inputorder = list(range(size))
-    outputorder = inputorder[:]
-    random.shuffle(outputorder)
-    inputorder, outputorder = _insert_delays(
-        inputorder, outputorder, min_lifetime, cyclic
+    inputorders = list(range(size))
+    outputorders = inputorders[:]
+    random.shuffle(outputorders)
+    inputorders, outputorders = _insert_delays(
+        inputorders, outputorders, min_lifetime, cyclic
     )
     return ProcessCollection(
         {
-            PlainMemoryVariable(inputorder[i], 0, {0: outputorder[i] - inputorder[i]})
-            for i in range(len(inputorder))
+            PlainMemoryVariable(inputorder, 0, {0: outputorders[i] - inputorder})
+            for i, inputorder in enumerate(inputorders)
         },
-        len(inputorder),
+        len(inputorders),
         cyclic,
     )
 
diff --git a/b_asic/signal_flow_graph.py b/b_asic/signal_flow_graph.py
index f3dd86df0032ded9c816f4fc93af4b5498b4ed5d..cf2d3a998dc09414d9e4070744df334e93a1c473 100644
--- a/b_asic/signal_flow_graph.py
+++ b/b_asic/signal_flow_graph.py
@@ -738,9 +738,7 @@ class SFG(AbstractOperation):
 
         # Find all first iter output ports for precedence
         first_iter_ports = [
-            op.output(i)
-            for op in (no_input_ops + delay_ops)
-            for i in range(op.output_count)
+            output for op in (no_input_ops + delay_ops) for output in op.outputs
         ]
 
         self._precedence_list = self._traverse_for_precedence_list(first_iter_ports)
@@ -756,8 +754,7 @@ class SFG(AbstractOperation):
         pg.attr(rankdir="LR")
 
         # Creates nodes for each output port in the precedence list
-        for i in range(len(p_list)):
-            ports = p_list[i]
+        for i, ports in enumerate(p_list):
             with pg.subgraph(name=f"cluster_{i}") as sub:
                 sub.attr(label=f"N{i}")
                 for port in ports:
@@ -779,8 +776,7 @@ class SFG(AbstractOperation):
                         )
         # Creates edges for each output port and creates nodes for each operation
         # and edges for them as well
-        for i in range(len(p_list)):
-            ports = p_list[i]
+        for i, ports in enumerate(p_list):
             for port in ports:
                 source_label = port.operation.graph_id
                 node_node = port.name