diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index e127340..19717fb 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -137,12 +137,12 @@
         return sorted(intents)
 
     # TODO
-    # this method generates all expected route intents for all BGP peers
+    # This method generates all expected route intents for all BGP peers
     def generate_expected_routeIntents(self):
         intents = []
         return intents
 
-    # this method extracts all actual routes from ONOS CLI
+    # This method extracts all actual routes from ONOS CLI
     def extract_actual_routes(self, get_routes_result):
         routes_json_obj = json.loads(get_routes_result)
 
@@ -154,7 +154,7 @@
 
         return sorted(allRoutes_actual)
 
-    # this method extracts all actual route intents from ONOS CLI
+    # This method extracts all actual route intents from ONOS CLI
     def extract_actual_routeIntents(self, get_intents_result):
         intents = []
         # TODO: delete the line below when change to Mininet demo script
@@ -173,7 +173,7 @@
                 intents.append(intent)
         return sorted(intents)
 
-    # this method extracts all actual BGP intents from ONOS CLI
+    # This method extracts all actual BGP intents from ONOS CLI
     def extract_actual_bgpIntents(self, get_intents_result):
         intents = []
         # TODO: delete the line below when change to Mininet demo script
@@ -266,7 +266,7 @@
             return main.TRUE
         return main.FALSE
     
-    # please use the generate_routes plus add_routes instead of this one
+    # Please use the generate_routes plus add_routes instead of this one
     def add_route(self, net, numRoutes, routeRate):
         try:
             self.handle.sendline("")
@@ -313,6 +313,7 @@
         if routes_added == numRoutes:
             return main.TRUE
         return main.FALSE
+
     def del_route(self, net, numRoutes, routeRate):
         try:
             self.handle.sendline("")
