diff --git a/senlin/api/openstack/v1/clusters.py b/senlin/api/openstack/v1/clusters.py
index 8a5aec965..612dc20c3 100644
--- a/senlin/api/openstack/v1/clusters.py
+++ b/senlin/api/openstack/v1/clusters.py
@@ -240,6 +240,7 @@ class ClusterController(object):
 
         raise exc.HTTPInternalServerError(_('Failed deleting cluster.'))
 
+
 def create_resource(options):
     '''Clusters resource factory method.'''
 
diff --git a/senlin/common/trust.py b/senlin/common/trust.py
index ef58d6671..7c16d2908 100644
--- a/senlin/common/trust.py
+++ b/senlin/common/trust.py
@@ -54,7 +54,7 @@ class SenlinTrust(object):
 
 
 def get_trust(context, trust_id):
-    '''Get trust detail information'''
+    '''Get trust detail information.'''
     conn = sdk.create_connection(context)
     session = conn.session
 
diff --git a/senlin/engine/actions/node_action.py b/senlin/engine/actions/node_action.py
index 16b1411d9..95fa72bb5 100644
--- a/senlin/engine/actions/node_action.py
+++ b/senlin/engine/actions/node_action.py
@@ -13,6 +13,7 @@
 from oslo_log import log as logging
 
 from senlin.common import exception
+from senlin.common.i18n import _
 from senlin.common.i18n import _LE
 from senlin.engine.actions import base
 from senlin.engine import node as node_mod
diff --git a/senlin/engine/health_manager.py b/senlin/engine/health_manager.py
index 1ca56947a..9364e99f8 100644
--- a/senlin/engine/health_manager.py
+++ b/senlin/engine/health_manager.py
@@ -15,7 +15,7 @@ Health Manager class.
 
 Health Manager is responsible for monitoring the health of the clusters and
 take corresponding actions to recover the clusters based on the pre-defined
-health policies. 
+health policies.
 '''
 
 import random
@@ -26,7 +26,6 @@ import oslo_messaging
 
 from senlin.common import consts
 from senlin.common import messaging as rpc_messaging
-from senlin.db import api as db_api
 from senlin.openstack.common import periodic_task
 from senlin.openstack.common import service
 
diff --git a/senlin/engine/service.py b/senlin/engine/service.py
index 6823972c3..0e7e4860e 100644
--- a/senlin/engine/service.py
+++ b/senlin/engine/service.py
@@ -135,7 +135,7 @@ class EngineService(service.Service):
         # Notify dispatcher to stop all action threads it started.
         self.dispatcher.stop()
 
-        # Notify health_manager to stop 
+        # Notify health_manager to stop
         self.health_mgr.stop()
 
         # Terminate the engine process
diff --git a/senlin/rpc/client.py b/senlin/rpc/client.py
index 318b22344..99f99e9be 100644
--- a/senlin/rpc/client.py
+++ b/senlin/rpc/client.py
@@ -93,7 +93,8 @@ class EngineClient(object):
     def profile_create(self, ctxt, name, type, spec, perm, tags):
         return self.call(ctxt,
                          self.make_msg('profile_create', name=name,
-                                       type=type, spec=spec, perm=perm, tags=tags))
+                                       type=type, spec=spec, perm=perm,
+                                       tags=tags))
 
     def profile_get(self, ctxt, identity):
         return self.call(ctxt,