diff --git a/api-daemon/pvcapid/Daemon.py b/api-daemon/pvcapid/Daemon.py
index daebf054..9d32afd3 100755
--- a/api-daemon/pvcapid/Daemon.py
+++ b/api-daemon/pvcapid/Daemon.py
@@ -29,7 +29,7 @@ import pvcapid.flaskapi as pvc_api
 if pvc_api.config['ssl_enabled']:
     context = (pvc_api.config['ssl_cert_file'], pvc_api.config['ssl_key_file'])
 else:
-    context=None
+    context = None
 
 print('Starting PVC API daemon at {}:{} with SSL={}, Authentication={}'.format(pvc_api.config['listen_address'], pvc_api.config['listen_port'], pvc_api.config['ssl_enabled'], pvc_api.config['auth_enabled']))
 pvc_api.app.run(pvc_api.config['listen_address'], pvc_api.config['listen_port'], threaded=True, ssl_context=context)
diff --git a/client-cli/cli_lib/node.py b/client-cli/cli_lib/node.py
index 24c2b6df..9f57d2d8 100644
--- a/client-cli/cli_lib/node.py
+++ b/client-cli/cli_lib/node.py
@@ -34,7 +34,7 @@ def node_coordinator_state(config, node, action):
     API arguments: action={action}
     API schema: {"message": "{data}"}
     """
-    params={
+    params = {
         'state': action
     }
     response = call_api(config, 'post', '/node/{node}/coordinator-state'.format(node=node), params=params)
@@ -54,7 +54,7 @@ def node_domain_state(config, node, action, wait):
     API arguments: action={action}, wait={wait}
     API schema: {"message": "{data}"}
     """
-    params={
+    params = {
         'state': action,
         'wait': str(wait).lower()
     }
diff --git a/client-cli/cli_lib/vm.py b/client-cli/cli_lib/vm.py
index 89a9c76f..ec09fbfa 100644
--- a/client-cli/cli_lib/vm.py
+++ b/client-cli/cli_lib/vm.py
@@ -170,7 +170,7 @@ def vm_remove(config, vm, delete_disks=False):
     API arguments: delete_disks={delete_disks}
     API schema: {"message":"{data}"}
     """
-    params={
+    params = {
         'delete_disks': delete_disks
     }
     response = call_api(config, 'delete', '/vm/{vm}'.format(vm=vm), params=params)
@@ -190,7 +190,7 @@ def vm_state(config, vm, target_state, wait=False):
     API arguments: state={state}, wait={wait}
     API schema: {"message":"{data}"}
     """
-    params={
+    params = {
         'state': target_state,
         'wait': str(wait).lower()
     }
@@ -211,7 +211,7 @@ def vm_node(config, vm, target_node, action, force=False, wait=False, force_live
     API arguments: node={target_node}, action={action}, force={force}, wait={wait}, force_live={force_live}
     API schema: {"message":"{data}"}
     """
-    params={
+    params = {
         'node': target_node,
         'action': action,
         'force': str(force).lower(),
diff --git a/client-cli/pvc.py b/client-cli/pvc.py
index f85b71d1..eacccfe7 100755
--- a/client-cli/pvc.py
+++ b/client-cli/pvc.py
@@ -3654,9 +3654,9 @@ def cli(_cluster, _debug, _quiet):
 
         if not _quiet:
             if config['api_scheme'] == 'https' and not config['verify_ssl']:
-                ssl_unverified_msg=' (unverified)'
+                ssl_unverified_msg = ' (unverified)'
             else:
-                ssl_unverified_msg=''
+                ssl_unverified_msg = ''
             click.echo(
                 'Using cluster "{}" - Host: "{}"  Scheme: "{}{}"  Prefix: "{}"'.format(
                     config['cluster'],