diff --git a/lib/pldm_utils.py b/lib/pldm_utils.py
index 81e53fe..f2541f9 100755
--- a/lib/pldm_utils.py
+++ b/lib/pldm_utils.py
@@ -31,14 +31,17 @@
       }
 
     Description of argument(s):
-    option_string                   A string of options which are to be processed by the pldmtool command.
-    parse_results                   Parse the pldmtool results and return a dictionary rather than the raw
-                                    pldmtool output.
-    bsu_options                     Options to be passed directly to bmc_execute_command.  See its prolog for
-                                    details.
+    option_string         A string of options which are to be processed by the
+                          pldmtool command.
+    parse_results         Parse the pldmtool results and return a dictionary
+                          rather than the raw
+                          pldmtool output.
+    bsu_options           Options to be passed directly to bmc_execute_command.
+                          See its prolog for details.
     """
 
-    # This allows callers to specify arguments in python style (e.g. print_out=1 vs. print_out=${1}).
+    # This allows callers to specify arguments in python style
+    # (e.g. print_out=1 vs. print_out=${1}).
     bsu_options = fa.args_to_objects(bsu_options)
 
     stdout, stderr, rc = bsu.bmc_execute_command(
@@ -133,9 +136,11 @@
 
     if attr_type == "BIOSInteger":
         return attr_val_int_dict
-    elif attr_type == "BIOSString":
+    if attr_type == "BIOSString":
         return attr_val_str_dict
 
+    return None
+
 
 def GetRandomBIOSIntAndStrValues(attr_name, count):
     """
@@ -276,7 +281,6 @@
         except ValueError:
             try:
                 # The data values have a double quote in them.
-                # Eg: '"IBM I"' instead of just 'IBM I'
                 data = '"' + str(existing_data[attr]) + '"'
                 temp_list[attr].remove(data)
             except ValueError:
diff --git a/lib/remote_logging_utils.robot b/lib/remote_logging_utils.robot
index f4c4fc8..4ed1479 100644
--- a/lib/remote_logging_utils.robot
+++ b/lib/remote_logging_utils.robot
@@ -32,9 +32,6 @@
     Write Attribute  ${REMOTE_LOGGING_URI}  Address  data=${host_dict}
     ...  verify=${TRUE}  expected_value=${remote_host}
 
-    # TODO: From Dev to do bump up restart service time and bulk address and
-    # port update API.
-    # Reference: https://github.com/ibm-openbmc/dev/issues/59
     Sleep  20s
 
     ${remote_port}=  Convert To Integer  ${remote_port}
@@ -42,9 +39,6 @@
     Write Attribute  ${REMOTE_LOGGING_URI}  Port  data=${port_dict}
     ...  verify=${TRUE}  expected_value=${remote_port}
 
-    # TODO: From Dev to do bump up restart service time and bulk address and
-    # port update API.
-    # Reference: https://github.com/ibm-openbmc/dev/issues/59
     Sleep  20s