diff --git a/swift/auth/server.py b/swift/auth/server.py
index 413c03cce1..8f1483ab27 100644
--- a/swift/auth/server.py
+++ b/swift/auth/server.py
@@ -149,31 +149,32 @@ class AuthController(object):
                 previous_prefix = ''
                 if '_' in row[0]:
                     previous_prefix = row[0].split('_', 1)[0]
-                msg = _(('''
+                msg = (_('''
 THERE ARE ACCOUNTS IN YOUR auth.db THAT DO NOT BEGIN WITH YOUR NEW RESELLER
-PREFIX OF "%s".
+PREFIX OF "%(reseller)s".
 YOU HAVE A FEW OPTIONS:
-    1) RUN "swift-auth-update-reseller-prefixes %s %s",
+    1. RUN "swift-auth-update-reseller-prefixes %(db_file)s %(reseller)s",
        "swift-init auth-server restart", AND
        "swift-auth-recreate-accounts -K ..." TO CREATE FRESH ACCOUNTS.
     OR
-    2) REMOVE %s, RUN "swift-init auth-server restart", AND RUN
+    2. REMOVE %(db_file)s, RUN "swift-init auth-server restart", AND RUN
        "swift-auth-add-user ..." TO CREATE BRAND NEW ACCOUNTS THAT WAY.
     OR
-    3) ADD "reseller_prefix = %s" (WITHOUT THE QUOTES) TO YOUR
+    3. ADD "reseller_prefix = %(previous)s" (WITHOUT THE QUOTES) TO YOUR
        proxy-server.conf IN THE [filter:auth] SECTION AND TO YOUR
        auth-server.conf IN THE [app:auth-server] SECTION AND RUN
        "swift-init proxy-server restart" AND "swift-init auth-server restart"
        TO REVERT BACK TO YOUR PREVIOUS RESELLER PREFIX.
 
-    %s
-                    ''') % (self.reseller_prefix.rstrip('_'), self.db_file,
-                    self.reseller_prefix.rstrip('_'), self.db_file,
-                    previous_prefix, previous_prefix and ' ' or _('''
+    %(note)s
+                    ''') % {'reseller': self.reseller_prefix.rstrip('_'),
+                            'db_file': self.db_file,
+                            'previous': previous_prefix,
+                            'note': previous_prefix and ' ' or _('''
     SINCE YOUR PREVIOUS RESELLER PREFIX WAS AN EMPTY STRING, IT IS NOT
     RECOMMENDED TO PERFORM OPTION 3 AS THAT WOULD MAKE SUPPORTING MULTIPLE
     RESELLERS MORE DIFFICULT.
-                    ''').strip())).strip()
+                    ''').strip()}).strip()
                 self.logger.critical(_('CRITICAL: ') + ' '.join(msg.split()))
                 raise Exception('\n' + msg)
 
@@ -243,7 +244,8 @@ YOU HAVE A FEW OPTIONS:
             raise err
 
     def validate_s3_sign(self, request, token):
-        account, user, sign = request.headers['Authorization'].split(' ')[-1].split(':')
+        account, user, sign = \
+            request.headers['Authorization'].split(' ')[-1].split(':')
         msg = base64.urlsafe_b64decode(unquote(token))
         rv = False
         with self.get_conn() as conn:
@@ -253,7 +255,8 @@ YOU HAVE A FEW OPTIONS:
                 (account, user)).fetchone()
             rv = (84000, account, user, row[1])
         if rv:
-            s = base64.encodestring(hmac.new(row[0], msg, sha1).digest()).strip()
+            s = base64.encodestring(hmac.new(row[0], msg,
+                                             sha1).digest()).strip()
             self.logger.info("orig %s, calc %s" % (sign, s))
             if sign != s:
                 rv = False
@@ -340,10 +343,14 @@ YOU HAVE A FEW OPTIONS:
                 'SELECT url FROM account WHERE account = ? AND user = ?',
                 (account, user)).fetchone()
             if row:
-                self.logger.info(
-                    _('ALREADY EXISTS create_user(%s, %s, _, %s, %s) [%.02f]') %
-                    (repr(account), repr(user), repr(admin),
-                     repr(reseller_admin), time() - begin))
+                self.logger.info(_('ALREADY EXISTS create_user(%(account)s, '
+                    '%(user)s, _, %(admin)s, %(reseller_admin)s) '
+                    '[%(elapsed).02f]') %
+                    {'account': repr(account),
+                     'user': repr(user),
+                     'admin': repr(admin),
+                     'reseller_admin': repr(reseller_admin),
+                     'elapsed': time() - begin})
                 return 'already exists'
             row = conn.execute(
                 'SELECT url, cfaccount FROM account WHERE account = ?',
@@ -354,10 +361,14 @@ YOU HAVE A FEW OPTIONS:
             else:
                 account_hash = self.add_storage_account()
                 if not account_hash:
-                    self.logger.info(
-                        _('FAILED create_user(%s, %s, _, %s, %s) [%.02f]') %
-                        (repr(account), repr(user), repr(admin),
-                         repr(reseller_admin), time() - begin))
+                    self.logger.info(_('FAILED create_user(%(account)s, '
+                        '%(user)s, _, %(admin)s, %(reseller_admin)s) '
+                        '[%(elapsed).02f]') %
+                        {'account': repr(account),
+                         'user': repr(user),
+                         'admin': repr(admin),
+                         'reseller_admin': repr(reseller_admin),
+                         'elapsed': time() - begin})
                     return False
                 url = self.default_cluster_url.rstrip('/') + '/' + account_hash
             conn.execute('''INSERT INTO account
@@ -367,10 +378,11 @@ YOU HAVE A FEW OPTIONS:
                 (account, url, account_hash, user, password,
                  admin and 't' or '', reseller_admin and 't' or ''))
             conn.commit()
-        self.logger.info(
-            _('SUCCESS create_user(%s, %s, _, %s, %s) = %s [%.02f]') %
-            (repr(account), repr(user), repr(admin), repr(reseller_admin),
-             repr(url), time() - begin))
+        self.logger.info(_('SUCCESS create_user(%(account)s, %(user)s, _, '
+            '%(admin)s, %(reseller_admin)s) = %(url)s [%(elapsed).02f]') %
+            {'account': repr(account), 'user': repr(user),
+             'admin': repr(admin), 'reseller_admin': repr(reseller_admin),
+             'url': repr(url), 'elapsed': time() - begin})
         return url
 
     def recreate_accounts(self):
diff --git a/swift/common/middleware/auth.py b/swift/common/middleware/auth.py
index a2c71a3070..a51788f7b7 100644
--- a/swift/common/middleware/auth.py
+++ b/swift/common/middleware/auth.py
@@ -59,8 +59,8 @@ class DevAuth(object):
         if s3 or (token and token.startswith(self.reseller_prefix)):
             # Note: Empty reseller_prefix will match all tokens.
             # Attempt to auth my token with my auth server
-            groups = \
-                self.get_groups(env, token, memcache_client=cache_from_env(env))
+            groups = self.get_groups(env, token,
+                                     memcache_client=cache_from_env(env))
             if groups:
                 env['REMOTE_USER'] = groups
                 user = groups and groups.split(',', 1)[0] or ''
@@ -154,10 +154,12 @@ class DevAuth(object):
                                     timeout=expiration)
 
         if env.get('HTTP_AUTHORIZATION'):
-            account, user, sign = env['HTTP_AUTHORIZATION'].split(' ')[-1].split(':')
+            account, user, sign = \
+                env['HTTP_AUTHORIZATION'].split(' ')[-1].split(':')
             cfaccount = resp.getheader('x-auth-account-suffix')
             path = env['PATH_INFO']
-            env['PATH_INFO'] = path.replace("%s:%s" % (account, user), cfaccount, 1)
+            env['PATH_INFO'] = \
+                path.replace("%s:%s" % (account, user), cfaccount, 1)
 
         return groups
 
diff --git a/swift/common/middleware/domain_remap.py b/swift/common/middleware/domain_remap.py
index e959276733..a6ed943bb2 100644
--- a/swift/common/middleware/domain_remap.py
+++ b/swift/common/middleware/domain_remap.py
@@ -35,7 +35,7 @@ class DomainRemapMiddleware(object):
     instead of the found reseller prefix. The reseller_prefixes list is
     exclusive. If defined, any request with an account prefix not in that list
     will be ignored by this middleware. reseller_prefixes defaults to 'AUTH'.
-    
+
     Note that this middleware requires that container names and account names
     (except as described above) must be DNS-compatible. This means that the
     account name created in the system and the containers created by users
@@ -111,4 +111,3 @@ def filter_factory(global_conf, **local_conf):
     def domain_filter(app):
         return DomainRemapMiddleware(app, conf)
     return domain_filter
-
diff --git a/swift/obj/replicator.py b/swift/obj/replicator.py
index ec76fb384c..fc7e7cbd07 100644
--- a/swift/obj/replicator.py
+++ b/swift/obj/replicator.py
@@ -407,7 +407,8 @@ class ObjectReplicator(Daemon):
                         conn.getresponse().read()
                     self.suffix_sync += len(suffixes)
                 except (Exception, Timeout):
-                    self.logger.exception(_("Error syncing with node: %s") % node)
+                    self.logger.exception(_("Error syncing with node: %s") %
+                                            node)
             self.suffix_count += len(local_hash)
         except (Exception, Timeout):
             self.logger.exception(_("Error syncing partition"))
diff --git a/swift/stats/account_stats.py b/swift/stats/account_stats.py
index 859151d238..6a9688831f 100644
--- a/swift/stats/account_stats.py
+++ b/swift/stats/account_stats.py
@@ -55,7 +55,8 @@ class AccountStat(Daemon):
         self.logger.info(_("Gathering account stats"))
         start = time.time()
         self.find_and_process()
-        self.logger.info(_("Gathering account stats complete (%0.2f minutes)") %
+        self.logger.info(
+            _("Gathering account stats complete (%0.2f minutes)") %
             ((time.time() - start) / 60))
 
     def find_and_process(self):
@@ -70,8 +71,8 @@ class AccountStat(Daemon):
             # Account Name, Container Count, Object Count, Bytes Used
             for device in os.listdir(self.devices):
                 if self.mount_check and not check_mount(self.devices, device):
-                    self.logger.error(_("Device %s is not mounted, skipping.") %
-                        device)
+                    self.logger.error(
+                        _("Device %s is not mounted, skipping.") % device)
                     continue
                 accounts = os.path.join(self.devices,
                                         device,
diff --git a/swift/stats/log_processor.py b/swift/stats/log_processor.py
index 8174fb265e..531ec3e0ac 100644
--- a/swift/stats/log_processor.py
+++ b/swift/stats/log_processor.py
@@ -280,7 +280,8 @@ class LogProcessorDaemon(Daemon):
         logs_to_process = self.log_processor.get_data_list(lookback_start,
                                                        lookback_end,
                                                        already_processed_files)
-        self.logger.info(_('loaded %d files to process') % len(logs_to_process))
+        self.logger.info(_('loaded %d files to process') %
+                         len(logs_to_process))
         if not logs_to_process:
             self.logger.info(_("Log processing done (%0.2f minutes)") %
                         ((time.time() - start) / 60))