diff --git a/AUTHORS b/AUTHORS
index c1b5ca6d3..97efafc57 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,21 +1,23 @@
-Andrey Brindeyev <abrindeyev@griddynamics.com>
-Andy Smith <github@anarkystic.com>
-Antony Messerli <amesserl@rackspace.com>
-Brian Lamar <brian.lamar@rackspace.com>
-Brian Waldon <brian.waldon@rackspace.com>
-Chris Behrens <cbehrens+github@codestud.com>
-Christopher MacGown <ignoti+github@gmail.com>
-Ed Leafe <ed@leafe.com>
-Eldar Nugaev <eldr@ya.ru>
-Hengqing Hu <hudayou@hotmail.com>
-Ilya Alekseyev <ilyaalekseyev@acm.org>
-Johannes Erdfelt <johannes.erdfelt@rackspace.com>
-Josh Kearney <josh@jk0.org>
-Kevin L. Mitchell <kevin.mitchell@rackspace.com>
-Kirill Shileev <kshileev@griddynamics.com>
-Lvov Maxim <mlvov@mirantis.com>
-Matt Dietz <matt.dietz@rackspace.com>
-Sandy Walsh <sandy@darksecretsoftware.com>
+Adam Gandelman <adamg@canonical.com>
+Alan Pevec <apevec@redhat.com>
+Anthony Young <sleepsonthefloor@gmail.com>
+Brian Waldon <bcwaldon@gmail.com>
+Dean Troyer <dtroyer@gmail.com>
+Dolph Mathews <dolph.mathews@gmail.com>
 Gabriel Hurley <gabriel@strikeawe.com>
+Ghe Rivero <ghe@debian.org>
+Hengqing Hu <hudayou@hotmail.com>
+Jenkins <jenkins@review.openstack.org>
+Jesse Andrews <anotherjesse@gmail.com>
 Joe Heck <heckj@mac.com>
+Josh Kearney <josh@jk0.org>
+Ken Thomas <krt@yahoo-inc.com>
+Monty Taylor <mordred@inaugust.com>
+Thierry Carrez <thierry@openstack.org>
+Tihomir Trifonov <t.trifonov@gmail.com>
+Vishvananda Ishaya <vishvananda@gmail.com>
 Yaguang Tang <heut2008@gmail.com>
+Zhongyue Luo <lzyeval@gmail.com>
+Ziad Sawalha <github@highbridgellc.com>
+jakedahn <jake@ansolabs.com>
+termie <github@anarkystic.com>
diff --git a/keystoneclient/client.py b/keystoneclient/client.py
index 3042d09d2..337f04891 100644
--- a/keystoneclient/client.py
+++ b/keystoneclient/client.py
@@ -11,8 +11,6 @@ OpenStack Client interface. Handles the REST calls and responses.
 import copy
 import logging
 import os
-import time
-import urllib
 import urlparse
 
 import httplib2
@@ -119,7 +117,7 @@ class HTTPClient(httplib2.Http):
         if body:
             try:
                 body = json.loads(body)
-            except ValueError, e:
+            except ValueError:
                 _logger.debug("Could not decode JSON from body: %s" % body)
         else:
             _logger.debug("No body was returned.")
diff --git a/keystoneclient/v2_0/tenants.py b/keystoneclient/v2_0/tenants.py
index 4ab1ee63d..eb371b88f 100644
--- a/keystoneclient/v2_0/tenants.py
+++ b/keystoneclient/v2_0/tenants.py
@@ -37,7 +37,7 @@ class Tenant(base.Resource):
                                          description=new_description,
                                          enabled=new_enabled)
             self = retval
-        except Exception, e:
+        except Exception:
             retval = None
         return retval