diff --git a/watcher/applier/workflow_engine/base.py b/watcher/applier/workflow_engine/base.py
index bf2b968f2..5fa7fcdb5 100644
--- a/watcher/applier/workflow_engine/base.py
+++ b/watcher/applier/workflow_engine/base.py
@@ -192,7 +192,7 @@ class BaseTaskFlowActionContainer(flow_task.Task):
                     fields.NotificationPhase.END)
             except Exception as e:
                 LOG.exception(e)
-                LOG.error('The workflow engine has failed'
+                LOG.error('The workflow engine has failed '
                           'to execute the action: %s', self.name)
                 db_action = self.engine.notify(self._db_action,
                                                objects.action.State.FAILED)
diff --git a/watcher/conf/applier.py b/watcher/conf/applier.py
index ec1bf3860..8aa6adc60 100644
--- a/watcher/conf/applier.py
+++ b/watcher/conf/applier.py
@@ -19,7 +19,7 @@
 from oslo_config import cfg
 
 watcher_applier = cfg.OptGroup(name='watcher_applier',
-                               title='Options for the Applier messaging'
+                               title='Options for the Applier messaging '
                                'core')
 
 APPLIER_MANAGER_OPTS = [
@@ -30,7 +30,7 @@ APPLIER_MANAGER_OPTS = [
                help='Number of workers for applier, default value is 1.'),
     cfg.StrOpt('conductor_topic',
                default='watcher.applier.control',
-               help='The topic name used for'
+               help='The topic name used for '
                     'control events, this topic '
                     'used for rpc call '),
     cfg.StrOpt('publisher_id',
diff --git a/watcher/conf/ceilometer_client.py b/watcher/conf/ceilometer_client.py
index 95b15ceaf..2ffbb9181 100644
--- a/watcher/conf/ceilometer_client.py
+++ b/watcher/conf/ceilometer_client.py
@@ -28,8 +28,8 @@ CEILOMETER_CLIENT_OPTS = [
                     'ceilometerclient.'),
     cfg.StrOpt('endpoint_type',
                default='internalURL',
-               help='Type of endpoint to use in ceilometerclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in ceilometerclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is internalURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/cinder_client.py b/watcher/conf/cinder_client.py
index 0b7ccf4f6..a06e41a05 100644
--- a/watcher/conf/cinder_client.py
+++ b/watcher/conf/cinder_client.py
@@ -27,8 +27,8 @@ CINDER_CLIENT_OPTS = [
                help='Version of Cinder API to use in cinderclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in cinderclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in cinderclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is publicURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/glance_client.py b/watcher/conf/glance_client.py
index e77dd73f1..a6d96adc2 100644
--- a/watcher/conf/glance_client.py
+++ b/watcher/conf/glance_client.py
@@ -27,8 +27,8 @@ GLANCE_CLIENT_OPTS = [
                help='Version of Glance API to use in glanceclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in glanceclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in glanceclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is publicURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/gnocchi_client.py b/watcher/conf/gnocchi_client.py
index b5882036e..4987ef6e1 100644
--- a/watcher/conf/gnocchi_client.py
+++ b/watcher/conf/gnocchi_client.py
@@ -27,8 +27,8 @@ GNOCCHI_CLIENT_OPTS = [
                help='Version of Gnocchi API to use in gnocchiclient.'),
     cfg.StrOpt('endpoint_type',
                default='public',
-               help='Type of endpoint to use in gnocchi client.'
-                    'Supported values: internal, public, admin'
+               help='Type of endpoint to use in gnocchi client. '
+                    'Supported values: internal, public, admin. '
                     'The default is public.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/ironic_client.py b/watcher/conf/ironic_client.py
index bcc87b68a..c97043eb5 100755
--- a/watcher/conf/ironic_client.py
+++ b/watcher/conf/ironic_client.py
@@ -27,8 +27,8 @@ IRONIC_CLIENT_OPTS = [
                help='Version of Ironic API to use in ironicclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in ironicclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in ironicclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is publicURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/monasca_client.py b/watcher/conf/monasca_client.py
index 39048ba7c..3e0094ff7 100644
--- a/watcher/conf/monasca_client.py
+++ b/watcher/conf/monasca_client.py
@@ -27,8 +27,8 @@ MONASCA_CLIENT_OPTS = [
                help='Version of Monasca API to use in monascaclient.'),
     cfg.StrOpt('interface',
                default='internal',
-               help='Type of interface used for monasca endpoint.'
-                    'Supported values: internal, public, admin'
+               help='Type of interface used for monasca endpoint. '
+                    'Supported values: internal, public, admin. '
                     'The default is internal.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/neutron_client.py b/watcher/conf/neutron_client.py
index b9b41ce89..94b49c378 100644
--- a/watcher/conf/neutron_client.py
+++ b/watcher/conf/neutron_client.py
@@ -27,8 +27,8 @@ NEUTRON_CLIENT_OPTS = [
                help='Version of Neutron API to use in neutronclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in neutronclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in neutronclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is publicURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/conf/nova_client.py b/watcher/conf/nova_client.py
index 4b29bd3ee..e5ae3910c 100755
--- a/watcher/conf/nova_client.py
+++ b/watcher/conf/nova_client.py
@@ -27,8 +27,8 @@ NOVA_CLIENT_OPTS = [
                help='Version of Nova API to use in novaclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in novaclient.'
-                    'Supported values: internalURL, publicURL, adminURL'
+               help='Type of endpoint to use in novaclient. '
+                    'Supported values: internalURL, publicURL, adminURL. '
                     'The default is publicURL.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
diff --git a/watcher/decision_engine/strategy/strategies/zone_migration.py b/watcher/decision_engine/strategy/strategies/zone_migration.py
index cbd917860..3d2fd5db7 100644
--- a/watcher/decision_engine/strategy/strategies/zone_migration.py
+++ b/watcher/decision_engine/strategy/strategies/zone_migration.py
@@ -89,7 +89,7 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
                                 "type": "string"
                             },
                             "dst_node": {
-                                "description": "Compute node to which"
+                                "description": "Compute node to which "
                                                "instances migrate",
                                 "type": "string"
                             }