diff --git a/git_upstream/commands/supersede.py b/git_upstream/commands/supersede.py
index 1d449aa..70093ef 100644
--- a/git_upstream/commands/supersede.py
+++ b/git_upstream/commands/supersede.py
@@ -17,7 +17,7 @@
 
 from git_upstream.errors import GitUpstreamError
 from git_upstream.log import LogDedentMixin
-from git_upstream.lib import note
+from git_upstream.lib import note  # noqa
 from git_upstream.lib.utils import GitMixin
 from git_upstream.lib.searchers import CommitMessageSearcher
 from git_upstream import subcommand, log
@@ -135,11 +135,11 @@ class Supersede(LogDedentMixin, GitMixin):
         Check if a supersede header is already present in the note containing
         one of change ids passed on the command line
         """
-        note = self.commit.note(note_ref=Supersede.NOTE_REF)
-        if note:
+        new_note = self.commit.note(note_ref=Supersede.NOTE_REF)
+        if new_note:
             pattern = '^%s\s?(%s)$' % (Supersede.SUPERSEDE_HEADER,
                                        '|'.join(self.change_ids))
-            m = re.search(pattern, note, re.MULTILINE | re.IGNORECASE)
+            m = re.search(pattern, new_note, re.MULTILINE | re.IGNORECASE)
             if m:
                 self.log.warning(
                     ("Change-Id '%s' already present in the note for commit" +
diff --git a/git_upstream/rebase_editor.py b/git_upstream/rebase_editor.py
index 02a21ee..4234a15 100755
--- a/git_upstream/rebase_editor.py
+++ b/git_upstream/rebase_editor.py
@@ -124,4 +124,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
diff --git a/setup.cfg b/setup.cfg
index 945ddb9..4046873 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,31 +9,30 @@ summary = git tool to help manage upstream repositories
 description-file = DESCRIPTION
 license = Apache License (2.0)
 keywords = git upstream workflow
-classifiers = 
-	Programming Language :: Python :: 2
-	Programming Language :: Python :: 3
-	Programming Language :: Python
-	Development Status :: 4 - Beta
-	Environment :: Console
-	Environment :: OpenStack
-	Intended Audience :: Developers
-	Intended Audience :: Information Technology
-	License :: OSI Approved :: Apache Software License
-	Operating System :: OS Independent
+classifiers =
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 3
+    Programming Language :: Python
+    Development Status :: 4 - Beta
+    Environment :: Console
+    Environment :: OpenStack
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
 
 [global]
 commands = build_manpage.BuildManpage
 
 [files]
-packages = 
-	git_upstream
+packages =
+    git_upstream
 data_files = 
-	etc/bash_completion.d = bash_completion/git-upstream
+    etc/bash_completion.d = bash_completion/git-upstream
 
 [entry_points]
-console_scripts = 
-	git-upstream = git_upstream.main:main
-	rebase-editor = git_upstream.rebase_editor:main
+console_scripts =
+    git-upstream = git_upstream.main:main
+    rebase-editor = git_upstream.rebase_editor:main
 
 [easy_install]
-