diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
index a94a45f..f2c3841 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
@@ -41,11 +41,11 @@
 			for (Edge channelToResourceEdge : middleChannelNode.getOutEdges()) {
 				ResourceNode sourceNode = (ResourceNode) resourceToChannelEdge.getSource();
 				ResourceNode destinationNode = (ResourceNode) channelToResourceEdge.getDestination();
-				if (!CodeGenerator.generatesComponent(sourceNode.getResourceHierarchy())) {
-					sourceNode = sourceNode.getParent();
+				if (!CodeGenerator.generatesComponent(sourceNode.getResourceHierarchy())) { // sourceNode is a leaf node
+					sourceNode = sourceNode.getParent(); // change sourceNode to its parent (It must correspond to a component resource)
 				}
-				if (!CodeGenerator.generatesComponent(destinationNode.getResourceHierarchy())) {
-					destinationNode = destinationNode.getParent();
+				if (!CodeGenerator.generatesComponent(destinationNode.getResourceHierarchy())) { // destinationNode is a leaf node
+					destinationNode = destinationNode.getParent(); // change destinationNode to its parent (It must correspond to a component resource)
 				}
 				
 				if (sourceNode.getResourceHierarchy().equals(destinationNode.getResourceHierarchy())) {
@@ -55,7 +55,7 @@
 				if (edgeAttribute.getOptions().get(0) == PushPullValue.PUSH) {
 					createEdgeChain(pushCallGraph, sourceNode, destinationNode, PushPullValue.PUSH);
 				} else {
-					createEdgeChain(pullCallGraph, destinationNode, sourceNode, PushPullValue.PULL);
+					createEdgeChain(pullCallGraph, sourceNode, destinationNode, PushPullValue.PULL);
 				}
 			}
 		}