diff --git a/barbicanclient/__init__.py b/barbicanclient/__init__.py
index 5498f3e0..61b2154b 100644
--- a/barbicanclient/__init__.py
+++ b/barbicanclient/__init__.py
@@ -1 +1 @@
-"""Barbican Client Library Binding"""
\ No newline at end of file
+"""Barbican Client Library Binding"""
diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index ecace17c..b42d536a 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -11,7 +11,6 @@ from barbicanclient.common import auth
 from barbicanclient.openstack.common import log
 from barbicanclient.common.exceptions import ClientException
 from barbicanclient.openstack.common.gettextutils import _
-from openstack.common.timeutils import parse_isotime
 from urlparse import urljoin
 
 
diff --git a/barbicanclient/common/auth.py b/barbicanclient/common/auth.py
index ab2a979c..891f9d63 100644
--- a/barbicanclient/common/auth.py
+++ b/barbicanclient/common/auth.py
@@ -64,7 +64,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
                 filter_value=region,
                 service_type=service_type,
                 endpoint_type=endpoint_type)
-        except exceptions.EndpointNotFound as ex:
+        except exceptions.EndpointNotFound:
             raise ClientException('Endpoint not found in service catalog')
 
     return endpoint, _ksclient.auth_token
diff --git a/barbicanclient/common/config.py b/barbicanclient/common/config.py
index e5d9d004..865b7482 100644
--- a/barbicanclient/common/config.py
+++ b/barbicanclient/common/config.py
@@ -23,6 +23,7 @@ import logging.handlers
 import os
 import sys
 
+from barbicanclient.openstack.common.gettextutils import _
 from barbicanclient.version import __version__
 from oslo.config import cfg
 
diff --git a/barbicanclient/common/utils.py b/barbicanclient/common/utils.py
index 843e04fe..55b1a0df 100644
--- a/barbicanclient/common/utils.py
+++ b/barbicanclient/common/utils.py
@@ -7,4 +7,4 @@ def proc_template(template, **kwargs):
     dictionary args and returning the strings.
     """
     return template.format(**dict([(k, urllib.quote(v))
-                           for k, v in kwargs.items()]))
\ No newline at end of file
+                           for k, v in kwargs.items()]))
diff --git a/barbicanclient/keep.py b/barbicanclient/keep.py
index d6a5bc5d..b939aef4 100644
--- a/barbicanclient/keep.py
+++ b/barbicanclient/keep.py
@@ -46,8 +46,8 @@ class Keep:
     def add_create_args(self):
         create_parser = self.subparsers.add_parser('create', help='Create a '
                                                    'secret or an order')
-        create_parser.add_argument('--name', '-n', help='a human-friendly name'
-                                  )
+        create_parser.add_argument('--name', '-n',
+                                   help='a human-friendly name')
         create_parser.add_argument('--algorithm', '-a', default='aes', help='t'
                                    'he algorithm; used only for reference (def'
                                    'ault: %(default)s)')
diff --git a/barbicanclient/secrets.py b/barbicanclient/secrets.py
index 0b9e27f4..d5ad4724 100644
--- a/barbicanclient/secrets.py
+++ b/barbicanclient/secrets.py
@@ -21,7 +21,8 @@ class Secret(object):
         self.algorithm = secret_dict.get('algorithm')
         self.bit_length = secret_dict.get('bit_length')
         self.payload_content_type = secret_dict.get('payload_content_type')
-        self.payload_content_encoding = secret_dict.get('payload_content_encoding')
+        self.payload_content_encoding = secret_dict.get(
+            'payload_content_encoding')
 
         self.cypher_type = secret_dict.get('cypher_type')
         self.name = secret_dict.get('name')