diff --git a/vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py b/vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py
index fd068d5865..917c4293f0 100644
--- a/vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py
+++ b/vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py
@@ -267,7 +267,7 @@ def nsx_redo_metadata_cfg_for_edge(context, plugin, edge_id):
         if (binding['router_id'].startswith(
                 vcns_constants.BACKUP_ROUTER_PREFIX) or
                 binding['router_id'].startswith(
-                    vcns_constants.PLR_EDGE_PREFIX)or
+                    vcns_constants.PLR_EDGE_PREFIX) or
                 binding['router_id'].startswith(
                     lb_common.RESOURCE_ID_PFX)):
             LOG.error('Edge %s is not a metadata delivery appliance', edge_id)
@@ -329,7 +329,7 @@ def nsx_redo_metadata_cfg_for_az(context, plugin, az_name, check_az=True):
                              not binding['router_id'].startswith(
                                  vcns_constants.BACKUP_ROUTER_PREFIX) and
                              not binding['router_id'].startswith(
-                                    vcns_constants.PLR_EDGE_PREFIX)and
+                                    vcns_constants.PLR_EDGE_PREFIX) and
                              not binding['router_id'].startswith(
                                     lb_common.RESOURCE_ID_PFX))]))
 
diff --git a/vmware_nsx/shell/nsxadmin.py b/vmware_nsx/shell/nsxadmin.py
index f79db8f313..48670556df 100644
--- a/vmware_nsx/shell/nsxadmin.py
+++ b/vmware_nsx/shell/nsxadmin.py
@@ -73,15 +73,15 @@ def _validate_resource_choice(resource, nsx_plugin):
         LOG.error('Supported list of NSX-V resources: %s',
                   resources.nsxv_resources_names)
         sys.exit(1)
-    elif nsx_plugin == 'nsxv3'and resource not in resources.nsxv3_resources:
+    elif nsx_plugin == 'nsxv3' and resource not in resources.nsxv3_resources:
         LOG.error('Supported list of NSX-V3 resources: %s',
                   resources.nsxv3_resources_names)
         sys.exit(1)
-    elif nsx_plugin == 'nsxtvd'and resource not in resources.nsxtvd_resources:
+    elif nsx_plugin == 'nsxtvd' and resource not in resources.nsxtvd_resources:
         LOG.error('Supported list of NSX-TVD resources: %s',
                   resources.nsxtvd_resources_names)
         sys.exit(1)
-    elif nsx_plugin == 'nsxp'and resource not in resources.nsxp_resources:
+    elif nsx_plugin == 'nsxp' and resource not in resources.nsxp_resources:
         LOG.error('Supported list of NSX-P resources: %s',
                   resources.nsxp_resources_names)
         sys.exit(1)