diff --git a/tendrl/node_agent/node_sync/disk_sync.py b/tendrl/node_agent/node_sync/disk_sync.py
index bfe0f02c..1f6adb8d 100644
--- a/tendrl/node_agent/node_sync/disk_sync.py
+++ b/tendrl/node_agent/node_sync/disk_sync.py
@@ -25,7 +25,9 @@ def sync():
 
             if "virtio" in disks[disk]["driver"]:
                 # Virtual disk
-                NS.tendrl.objects.VirtualDisk(**disks[disk]).save(ttl=_keep_alive_for)
+                NS.tendrl.objects.VirtualDisk(**disks[disk]).save(
+                    ttl=_keep_alive_for
+                )
             else:
                 # physical disk
                 NS.tendrl.objects.Disk(**disks[disk]).save(ttl=_keep_alive_for)
@@ -170,16 +172,16 @@ def get_disk_details():
                         disk.split(':')[1].lstrip().replace('"', "")
                 elif key.strip() == "Vendor":
                     devlist["vendor"] = \
-                        disk.split(':')[1].lstrip().replace('"', "")
+                        disk.split(':')[1].replace(" ", "").replace('"', "")
                 elif key.strip() == "Device":
                     devlist["device"] = \
-                        disk.split(':')[1].lstrip().replace('"', "")
+                        disk.split(':')[1].replace(" ", "").replace('"', "")
                 elif key.strip() == "Revision":
                     devlist["rmversion"] = \
                         disk.split(':')[1].lstrip().replace('"', "")
                 elif key.strip() == "Serial ID":
                     devlist["serial_no"] = \
-                        disk.split(':')[1].lstrip().replace('"', "")
+                        disk.split(':')[1].replace(" ", "").replace('"', "")
                 elif key.strip() == "Driver":
                     devlist["driver"] = \
                         disk.split(':')[1].lstrip().replace('"', "")
diff --git a/tendrl/node_agent/node_sync/network_sync.py b/tendrl/node_agent/node_sync/network_sync.py
index df533eae..0c2d634c 100644
--- a/tendrl/node_agent/node_sync/network_sync.py
+++ b/tendrl/node_agent/node_sync/network_sync.py
@@ -14,7 +14,9 @@ def sync():
         interfaces = get_node_network()
         if len(interfaces) > 0:
             for interface in interfaces:
-                NS.tendrl.objects.NodeNetwork(**interface).save(ttl=_keep_alive_for)
+                NS.tendrl.objects.NodeNetwork(**interface).save(
+                    ttl=_keep_alive_for
+                )
                 if interface['ipv4']:
                     for ipv4 in interface['ipv4']:
                         index_key = "/indexes/ip/%s" % ipv4