diff --git a/.mailmap b/.mailmap
index c516f96b8a..8e9a482e09 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,7 +22,7 @@ Joe Arnold <joe@swiftstack.com> <joe@cloudscaling.com>
 Kapil Thangavelu <kapil.foss@gmail.com> kapil.foss@gmail.com <>
 Samuel Merritt <sam@swiftstack.com> <spam@andcheese.org>
 Morita Kazutaka <morita.kazutaka@gmail.com>
-Zhong Yue Luo <lzyeval@gmail.com> lzyeval <lzyeval@gmail.com>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
 Russ Nelson <russ@crynwr.com> <nelson@nelson-laptop>
 Marcelo Martins <btorch@gmail.com> <marcelo.martins@rackspace.com>
 Andrew Clay Shafer <acs@parvuscaptus.com> <andrew@cloudscaling.com>
diff --git a/AUTHORS b/AUTHORS
index caca35b7f8..1fc5dd4334 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -55,8 +55,8 @@ Eugene Kirpichov (ekirpichov@gmail.com)
 Ed Leafe (ed.leafe@rackspace.com)
 Tong Li (litong01@us.ibm.com)
 Victor Lowther (victor.lowther@gmail.com)
-Zhong Yue Luo (lzyeval@gmail.com)
 Christopher MacGown (chris@pistoncloud.com)
+Zhongyue Luo (zhongyue.nah@intel.com)
 Dragos Manolescu (dragosm@hp.com)
 Juan J. Martinez (juan@memset.com)
 Marcelo Martins (btorch@gmail.com)
diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py
index 7e0dd82bac..605a86278e 100644
--- a/swift/proxy/controllers/base.py
+++ b/swift/proxy/controllers/base.py
@@ -265,7 +265,7 @@ class Controller(object):
         :returns: True if error limited, False otherwise
         """
         now = time.time()
-        if not 'errors' in node:
+        if 'errors' not in node:
             return False
         if 'last_error' in node and node['last_error'] < \
                 now - self.app.error_suppression_interval:
diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py
index 3d1524c210..2a397568c9 100644
--- a/test/functional/swift_test_client.py
+++ b/test/functional/swift_test_client.py
@@ -87,7 +87,7 @@ def listing_items(method):
 class Connection(object):
     def __init__(self, config):
         for key in 'auth_host auth_port auth_ssl username password'.split():
-            if not key in config:
+            if key not in config:
                 raise SkipTest
 
         self.auth_host = config['auth_host']
@@ -301,7 +301,7 @@ class Base:
         headers = dict(self.conn.response.getheaders())
         ret = {}
         for field in fields:
-            if not field[1] in headers:
+            if field[1] not in headers:
                 raise ValueError("%s was not found in response header" %
                                  (field[1]))