diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues
index c39081458bd..e61da9a7324 100755
--- a/bin/cinder-clear-rabbit-queues
+++ b/bin/cinder-clear-rabbit-queues
@@ -43,8 +43,8 @@ gettext.install('cinder', unicode=1)
 from cinder import context
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 
 
diff --git a/bin/cinder-manage b/bin/cinder-manage
index 19bb1d6ea55..cfd0c762125 100755
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -61,8 +61,8 @@ import sys
 import uuid
 
 from sqlalchemy import create_engine, MetaData, Table
-from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
 
 
 # If ../cinder/__init__.py exists, add ../ to Python search path, so that
@@ -80,8 +80,8 @@ from cinder import db
 from cinder.db import migration
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder import utils
 from cinder import version
diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
index b694682e874..5365d9cdcd0 100644
--- a/cinder/db/sqlalchemy/migration.py
+++ b/cinder/db/sqlalchemy/migration.py
@@ -26,9 +26,9 @@ from cinder import flags
 from cinder.openstack.common import log as logging
 
 
-import sqlalchemy
 import migrate
 from migrate.versioning import util as migrate_util
+import sqlalchemy
 
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/utils.py b/cinder/utils.py
index 40be4ff96eb..f9fec02607f 100644
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -315,8 +315,8 @@ class SSHPool(pools.Pool):
             transport.set_keepalive(self.conn_timeout)
             return ssh
         except Exception as e:
-            msg = "Error connecting via ssh: %s" % e
-            LOG.error(_(msg))
+            msg = _("Error connecting via ssh: %s") % e
+            LOG.error(msg)
             raise paramiko.SSHException(msg)
 
     def get(self):
diff --git a/cinder/volume/san/san.py b/cinder/volume/san/san.py
index c38a98cef62..dc2076ef770 100644
--- a/cinder/volume/san/san.py
+++ b/cinder/volume/san/san.py
@@ -122,11 +122,11 @@ class SanISCSIDriver(ISCSIDriver):
                     except Exception as e:
                         LOG.error(e)
                         greenthread.sleep(random.randint(20, 500) / 100.0)
-                raise paramiko.SSHException(_("SSH Command failed after '%r' "
-                                              "attempts: '%s'"
-                                              % (total_attempts, command)))
+                raise paramiko.SSHException(_("SSH Command failed after "
+                                              "'%(total_attempts)r' attempts"
+                                              ": '%(command)s'"), locals())
         except Exception as e:
-            LOG.error(_("Error running ssh command: %s" % command))
+            LOG.error(_("Error running ssh command: %s") % command)
             raise e
 
     def ensure_export(self, context, volume):