diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
index d4950d2..89e8da6 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
@@ -84,7 +84,11 @@
 		collection.add(eventEntry);
 		networkEvents.drainTo(collection);
 
-		// Demultiplex all events
+		//
+		// Demultiplex all events:
+		//  - EventEntry<TopologyElement>
+		//  - EventEntry<FlowPath>
+		//
 		for (EventEntry<?> event : collection) {
 		    if (event.eventData() instanceof TopologyElement) {
 			EventEntry<TopologyElement> topologyEventEntry =
@@ -97,6 +101,7 @@
 		    }
 		}
 		collection.clear();
+
 		// Process the events (if any)
 		processEvents();
 	    }
@@ -114,8 +119,7 @@
 
 	// TODO: Implement it!
 
-	System.out.println("PAVPAV: Topology Events = " + topologyEvents.size() + " Flow Path Events = " + flowPathEvents.size());
-
+	// Cleanup
 	topologyEvents.clear();
 	flowPathEvents.clear();
     }