diff --git a/backportpackage b/backportpackage
index c86586a..66a8931 100755
--- a/backportpackage
+++ b/backportpackage
@@ -31,22 +31,21 @@ try:
     import lsb_release
 except ImportError:
     lsb_release = None
-from httplib2 import Http, HttpLib2Error
 from distro_info import DebianDistroInfo, UbuntuDistroInfo
-
-from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage, DownloadError
-from ubuntutools.config import UDTConfig, ubu_email
-from ubuntutools.builder import get_builder
-from ubuntutools.lp.lpapicache import (
-    Launchpad,
-    Distribution,
-    SeriesNotFoundException,
-    PackageNotFoundException,
-)
-from ubuntutools.misc import system_distribution, vendor_to_distroinfo, codename_to_distribution
-from ubuntutools.question import YesNoQuestion
+from httplib2 import Http, HttpLib2Error
 
 from ubuntutools import getLogger
+from ubuntutools.archive import DebianSourcePackage, DownloadError, UbuntuSourcePackage
+from ubuntutools.builder import get_builder
+from ubuntutools.config import UDTConfig, ubu_email
+from ubuntutools.lp.lpapicache import (
+    Distribution,
+    Launchpad,
+    PackageNotFoundException,
+    SeriesNotFoundException,
+)
+from ubuntutools.misc import codename_to_distribution, system_distribution, vendor_to_distroinfo
+from ubuntutools.question import YesNoQuestion
 
 Logger = getLogger()
 
diff --git a/bitesize b/bitesize
index bcb9cb0..7e11727 100755
--- a/bitesize
+++ b/bitesize
@@ -24,12 +24,11 @@
 import sys
 from optparse import OptionParser
 
-from launchpadlib.launchpad import Launchpad
 from launchpadlib.errors import HTTPError
-
-from ubuntutools.config import UDTConfig
+from launchpadlib.launchpad import Launchpad
 
 from ubuntutools import getLogger
+from ubuntutools.config import UDTConfig
 
 Logger = getLogger()
 
diff --git a/check-mir b/check-mir
index 92f770d..62c5220 100755
--- a/check-mir
+++ b/check-mir
@@ -21,9 +21,9 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import sys
 import optparse
 import os.path
+import sys
 
 import apt
 
diff --git a/grep-merges b/grep-merges
index c50293f..92b930b 100755
--- a/grep-merges
+++ b/grep-merges
@@ -19,14 +19,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import json
 import optparse
 import sys
-import json
 
 from httplib2 import Http, HttpLib2Error
 
 import ubuntutools.misc
-
 from ubuntutools import getLogger
 
 Logger = getLogger()
diff --git a/import-bug-from-debian b/import-bug-from-debian
index 9553a29..14f5480 100755
--- a/import-bug-from-debian
+++ b/import-bug-from-debian
@@ -22,17 +22,16 @@
 # ##################################################################
 
 import argparse
-import debianbts
 import logging
 import re
 import sys
 import webbrowser
 
+import debianbts
 from launchpadlib.launchpad import Launchpad
 
-from ubuntutools.config import UDTConfig
-
 from ubuntutools import getLogger
+from ubuntutools.config import UDTConfig
 
 Logger = getLogger()
 
diff --git a/pbuilder-dist b/pbuilder-dist
index 732a298..506d6ed 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -31,21 +31,20 @@
 
 import os
 import os.path
-import sys
-import subprocess
 import shutil
+import subprocess
+import sys
+from contextlib import suppress
 
 import debian.deb822
-from contextlib import suppress
-from distro_info import DebianDistroInfo, UbuntuDistroInfo, DistroDataOutdated
+from distro_info import DebianDistroInfo, DistroDataOutdated, UbuntuDistroInfo
 
 import ubuntutools.misc
 import ubuntutools.version
+from ubuntutools import getLogger
 from ubuntutools.config import UDTConfig
 from ubuntutools.question import YesNoQuestion
 
-from ubuntutools import getLogger
-
 Logger = getLogger()
 
 
diff --git a/pull-debian-debdiff b/pull-debian-debdiff
index 6731c96..8f1957a 100755
--- a/pull-debian-debdiff
+++ b/pull-debian-debdiff
@@ -22,12 +22,11 @@ import sys
 
 import debian.changelog
 
+from ubuntutools import getLogger
 from ubuntutools.archive import DebianSourcePackage, DownloadError
 from ubuntutools.config import UDTConfig
 from ubuntutools.version import Version
 
-from ubuntutools import getLogger
-
 Logger = getLogger()
 
 
diff --git a/requestbackport b/requestbackport
index 99f8316..7bea964 100755
--- a/requestbackport
+++ b/requestbackport
@@ -14,20 +14,19 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from collections import defaultdict
 import optparse
 import sys
+from collections import defaultdict
 
 import apt
 from distro_info import UbuntuDistroInfo
 
-from ubuntutools.config import UDTConfig
-from ubuntutools.lp.lpapicache import Launchpad, Distribution
-from ubuntutools.lp.udtexceptions import PackageNotFoundException
-from ubuntutools.question import YesNoQuestion, EditBugReport, confirmation_prompt
-from ubuntutools.rdepends import query_rdepends, RDependsException
-
 from ubuntutools import getLogger
+from ubuntutools.config import UDTConfig
+from ubuntutools.lp.lpapicache import Distribution, Launchpad
+from ubuntutools.lp.udtexceptions import PackageNotFoundException
+from ubuntutools.question import EditBugReport, YesNoQuestion, confirmation_prompt
+from ubuntutools.rdepends import RDependsException, query_rdepends
 
 Logger = getLogger()
 
diff --git a/requestsync b/requestsync
index f8df736..08d5298 100755
--- a/requestsync
+++ b/requestsync
@@ -32,14 +32,13 @@ import sys
 
 from distro_info import UbuntuDistroInfo
 
+from ubuntutools import getLogger
 from ubuntutools.config import UDTConfig, ubu_email
 from ubuntutools.lp import udtexceptions
 from ubuntutools.misc import require_utf8
-from ubuntutools.question import confirmation_prompt, EditBugReport
+from ubuntutools.question import EditBugReport, confirmation_prompt
 from ubuntutools.version import Version
 
-from ubuntutools import getLogger
-
 Logger = getLogger()
 
 #
@@ -176,15 +175,15 @@ def main():
 
     # import the needed requestsync module
     if options.lpapi:
+        from ubuntutools.lp.lpapicache import Distribution, Launchpad
         from ubuntutools.requestsync.lp import (
             check_existing_reports,
             get_debian_srcpkg,
-            get_ubuntu_srcpkg,
             get_ubuntu_delta_changelog,
+            get_ubuntu_srcpkg,
             need_sponsorship,
             post_bug,
         )
-        from ubuntutools.lp.lpapicache import Distribution, Launchpad
 
         # See if we have LP credentials and exit if we don't -
         # cannot continue in this case
@@ -198,8 +197,8 @@ def main():
         from ubuntutools.requestsync.mail import (
             check_existing_reports,
             get_debian_srcpkg,
-            get_ubuntu_srcpkg,
             get_ubuntu_delta_changelog,
+            get_ubuntu_srcpkg,
             mail_bug,
             need_sponsorship,
         )
diff --git a/reverse-depends b/reverse-depends
index ac7bcf0..2d6bed6 100755
--- a/reverse-depends
+++ b/reverse-depends
@@ -19,10 +19,9 @@ import sys
 
 from distro_info import DistroDataOutdated
 
-from ubuntutools.misc import system_distribution, vendor_to_distroinfo, codename_to_distribution
-from ubuntutools.rdepends import query_rdepends, RDependsException
-
 from ubuntutools import getLogger
+from ubuntutools.misc import codename_to_distribution, system_distribution, vendor_to_distroinfo
+from ubuntutools.rdepends import RDependsException, query_rdepends
 
 Logger = getLogger()
 
diff --git a/seeded-in-ubuntu b/seeded-in-ubuntu
index c395941..9792729 100755
--- a/seeded-in-ubuntu
+++ b/seeded-in-ubuntu
@@ -22,9 +22,8 @@ import os
 import time
 import urllib.request
 
-from ubuntutools.lp.lpapicache import Distribution, Launchpad, PackageNotFoundException
-
 from ubuntutools import getLogger
+from ubuntutools.lp.lpapicache import Distribution, Launchpad, PackageNotFoundException
 
 Logger = getLogger()
 
diff --git a/setup.py b/setup.py
index 51dc0b2..4e4fb98 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,11 @@
 #!/usr/bin/python3
 
-from setuptools import setup
 import glob
 import os
 import re
 
+from setuptools import setup
+
 
 def make_pep440_compliant(version: str) -> str:
     """Convert the version into a PEP440 compliant version."""
diff --git a/sponsor-patch b/sponsor-patch
index 3a8f886..e719adf 100755
--- a/sponsor-patch
+++ b/sponsor-patch
@@ -14,18 +14,17 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import logging
 import optparse
 import os
 import shutil
 import sys
 import tempfile
-import logging
-
-from ubuntutools.builder import get_builder
-from ubuntutools.config import UDTConfig
-from ubuntutools.sponsor_patch.sponsor_patch import sponsor_patch, check_dependencies
 
 from ubuntutools import getLogger
+from ubuntutools.builder import get_builder
+from ubuntutools.config import UDTConfig
+from ubuntutools.sponsor_patch.sponsor_patch import check_dependencies, sponsor_patch
 
 Logger = getLogger()
 
diff --git a/submittodebian b/submittodebian
index e78e2c4..40b5788 100755
--- a/submittodebian
+++ b/submittodebian
@@ -27,19 +27,16 @@ import os
 import re
 import shutil
 import sys
-
-from subprocess import call, check_call, run, Popen, PIPE, DEVNULL
-
+from subprocess import DEVNULL, PIPE, Popen, call, check_call, run
 from tempfile import mkdtemp
 
 from debian.changelog import Changelog
-from distro_info import UbuntuDistroInfo, DistroDataOutdated
-
-from ubuntutools.config import ubu_email
-from ubuntutools.question import YesNoQuestion, EditFile
-from ubuntutools.update_maintainer import update_maintainer, restore_maintainer
+from distro_info import DistroDataOutdated, UbuntuDistroInfo
 
 from ubuntutools import getLogger
+from ubuntutools.config import ubu_email
+from ubuntutools.question import EditFile, YesNoQuestion
+from ubuntutools.update_maintainer import restore_maintainer, update_maintainer
 
 Logger = getLogger()
 
diff --git a/syncpackage b/syncpackage
index aae1899..a54f183 100755
--- a/syncpackage
+++ b/syncpackage
@@ -32,7 +32,8 @@ import urllib.request
 
 from lazr.restfulclient.errors import HTTPError
 
-from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage, DownloadError
+from ubuntutools import getLogger
+from ubuntutools.archive import DebianSourcePackage, DownloadError, UbuntuSourcePackage
 from ubuntutools.config import UDTConfig, ubu_email
 from ubuntutools.lp import udtexceptions
 from ubuntutools.lp.lpapicache import (
@@ -43,12 +44,10 @@ from ubuntutools.lp.lpapicache import (
 )
 from ubuntutools.misc import split_release_pocket
 from ubuntutools.question import YesNoQuestion
-from ubuntutools.requestsync.mail import get_debian_srcpkg as requestsync_mail_get_debian_srcpkg
 from ubuntutools.requestsync.lp import get_debian_srcpkg, get_ubuntu_srcpkg
+from ubuntutools.requestsync.mail import get_debian_srcpkg as requestsync_mail_get_debian_srcpkg
 from ubuntutools.version import Version
 
-from ubuntutools import getLogger
-
 Logger = getLogger()
 
 
diff --git a/ubuntu-build b/ubuntu-build
index 5d70aa1..29e6e8d 100755
--- a/ubuntu-build
+++ b/ubuntu-build
@@ -22,20 +22,19 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Our modules to import.
 import sys
-from optparse import OptionGroup
-from optparse import OptionParser
-from ubuntutools.lp.udtexceptions import (
-    SeriesNotFoundException,
-    PackageNotFoundException,
-    PocketDoesNotExistError,
-)
-from ubuntutools.lp.lpapicache import Distribution, Launchpad, PersonTeam
+from optparse import OptionGroup, OptionParser
+
 from launchpadlib.credentials import TokenAuthorizationException
-from ubuntutools.misc import split_release_pocket
 
 from ubuntutools import getLogger
+from ubuntutools.lp.lpapicache import Distribution, Launchpad, PersonTeam
+from ubuntutools.lp.udtexceptions import (
+    PackageNotFoundException,
+    PocketDoesNotExistError,
+    SeriesNotFoundException,
+)
+from ubuntutools.misc import split_release_pocket
 
 Logger = getLogger()
 
diff --git a/ubuntu-upload-permission b/ubuntu-upload-permission
index 988c445..331aa8d 100755
--- a/ubuntu-upload-permission
+++ b/ubuntu-upload-permission
@@ -17,18 +17,17 @@
 import optparse
 import sys
 
+from ubuntutools import getLogger
 from ubuntutools.lp.lpapicache import (
-    Launchpad,
     Distribution,
-    PersonTeam,
-    Packageset,
+    Launchpad,
     PackageNotFoundException,
+    Packageset,
+    PersonTeam,
     SeriesNotFoundException,
 )
 from ubuntutools.misc import split_release_pocket
 
-from ubuntutools import getLogger
-
 Logger = getLogger()
 
 
diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index bee45d2..e2ceb70 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -27,52 +27,48 @@ Approach:
 3. Verify checksums.
 """
 
-from urllib.request import urlopen, urlparse, urljoin
 import codecs
 import functools
 import json
+import logging
 import os
 import re
 import subprocess
 import sys
 import tempfile
-
 from abc import ABC, abstractmethod
-
-from debian.changelog import Changelog
-import debian.deb822
-
 from contextlib import closing
-
 from pathlib import Path
+from urllib.request import urljoin, urlopen, urlparse
+
+import debian.deb822
+from debian.changelog import Changelog
 
 from ubuntutools.config import UDTConfig
 from ubuntutools.lp.lpapicache import (
-    Launchpad,
     Distribution,
+    HTTPError,
+    Launchpad,
     PersonTeam,
     Project,
     SourcePackagePublishingHistory,
-    HTTPError,
 )
 from ubuntutools.lp.udtexceptions import (
-    PackageNotFoundException,
-    SeriesNotFoundException,
-    PocketDoesNotExistError,
     InvalidDistroValueError,
+    PackageNotFoundException,
+    PocketDoesNotExistError,
+    SeriesNotFoundException,
 )
 from ubuntutools.misc import (
+    DownloadError,
+    NotFoundError,
     download,
     download_bytes,
     verify_file_checksum,
     verify_file_checksums,
-    DownloadError,
-    NotFoundError,
 )
 from ubuntutools.version import Version
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 
diff --git a/ubuntutools/builder.py b/ubuntutools/builder.py
index 943d3c7..9182832 100644
--- a/ubuntutools/builder.py
+++ b/ubuntutools/builder.py
@@ -18,11 +18,10 @@
 #   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+import logging
 import os
 import subprocess
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 
diff --git a/ubuntutools/config.py b/ubuntutools/config.py
index d1a9e2f..0a1bfa0 100644
--- a/ubuntutools/config.py
+++ b/ubuntutools/config.py
@@ -15,15 +15,14 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
+import locale
+import logging
 import os
 import pwd
 import re
 import shlex
 import socket
 import sys
-import locale
-
-import logging
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/lp/lpapicache.py b/ubuntutools/lp/lpapicache.py
index f540084..30d6001 100644
--- a/ubuntutools/lp/lpapicache.py
+++ b/ubuntutools/lp/lpapicache.py
@@ -22,28 +22,19 @@
 #   Based on code written by Jonathan Davies <jpds@ubuntu.com>
 
 import collections
+import logging
 import os
 import re
-
 from copy import copy
-
-from debian.changelog import Changelog
-from launchpadlib.launchpad import Launchpad as LP
-from launchpadlib.errors import HTTPError
-from lazr.restfulclient.resource import Entry
 from urllib.error import URLError
 from urllib.parse import urlparse
 
-from ubuntutools.version import Version
-from ubuntutools.lp import service, api_version
-from ubuntutools.misc import (
-    download_text,
-    host_architecture,
-    DEFAULT_POCKETS,
-    POCKETS,
-    DEFAULT_STATUSES,
-    STATUSES,
-)
+from debian.changelog import Changelog
+from launchpadlib.errors import HTTPError
+from launchpadlib.launchpad import Launchpad as LP
+from lazr.restfulclient.resource import Entry
+
+from ubuntutools.lp import api_version, service
 from ubuntutools.lp.udtexceptions import (
     AlreadyLoggedInError,
     ArchiveNotFoundException,
@@ -52,8 +43,15 @@ from ubuntutools.lp.udtexceptions import (
     PocketDoesNotExistError,
     SeriesNotFoundException,
 )
-
-import logging
+from ubuntutools.misc import (
+    DEFAULT_POCKETS,
+    DEFAULT_STATUSES,
+    POCKETS,
+    STATUSES,
+    download_text,
+    host_architecture,
+)
+from ubuntutools.version import Version
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/misc.py b/ubuntutools/misc.py
index 24a19ea..7b8bf56 100644
--- a/ubuntutools/misc.py
+++ b/ubuntutools/misc.py
@@ -22,23 +22,22 @@
 #
 # ##################################################################
 
-import distro_info
 import hashlib
 import locale
+import logging
 import os
-import requests
 import shutil
 import sys
 import tempfile
-
 from contextlib import suppress
 from pathlib import Path
-from subprocess import check_output, CalledProcessError
+from subprocess import CalledProcessError, check_output
 from urllib.parse import urlparse
 
-from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
+import distro_info
+import requests
 
-import logging
+from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/pullpkg.py b/ubuntutools/pullpkg.py
index 44b4569..c75ef02 100644
--- a/ubuntutools/pullpkg.py
+++ b/ubuntutools/pullpkg.py
@@ -22,47 +22,43 @@
 # ##################################################################
 
 
+import errno
+import logging
 import os
 import re
-import sys
-import errno
 import subprocess
-
+import sys
 from argparse import ArgumentParser
+from urllib.parse import urlparse
 
 from distro_info import DebianDistroInfo
 
-from urllib.parse import urlparse
-
+# by default we use standard logging.getLogger() and only use
+# ubuntutools.getLogger() in PullPkg().main()
+from ubuntutools import getLogger as ubuntutools_getLogger
 from ubuntutools.archive import (
-    UbuntuSourcePackage,
     DebianSourcePackage,
-    UbuntuCloudArchiveSourcePackage,
     PersonalPackageArchiveSourcePackage,
+    UbuntuCloudArchiveSourcePackage,
+    UbuntuSourcePackage,
 )
 from ubuntutools.config import UDTConfig
 from ubuntutools.lp.lpapicache import Distribution, Launchpad
 from ubuntutools.lp.udtexceptions import (
     AlreadyLoggedInError,
-    SeriesNotFoundException,
+    InvalidDistroValueError,
     PackageNotFoundException,
     PocketDoesNotExistError,
-    InvalidDistroValueError,
+    SeriesNotFoundException,
 )
 from ubuntutools.misc import (
-    split_release_pocket,
-    host_architecture,
-    download,
-    UPLOAD_QUEUE_STATUSES,
     STATUSES,
+    UPLOAD_QUEUE_STATUSES,
+    download,
+    host_architecture,
+    split_release_pocket,
 )
 
-
-# by default we use standard logging.getLogger() and only use
-# ubuntutools.getLogger() in PullPkg().main()
-from ubuntutools import getLogger as ubuntutools_getLogger
-import logging
-
 Logger = logging.getLogger(__name__)
 
 PULL_SOURCE = "source"
diff --git a/ubuntutools/question.py b/ubuntutools/question.py
index fff2541..07f4741 100644
--- a/ubuntutools/question.py
+++ b/ubuntutools/question.py
@@ -16,11 +16,11 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-import tempfile
 import os
 import re
 import subprocess
 import sys
+import tempfile
 
 
 class Question(object):
diff --git a/ubuntutools/requestsync/lp.py b/ubuntutools/requestsync/lp.py
index 64ced68..0c2d884 100644
--- a/ubuntutools/requestsync/lp.py
+++ b/ubuntutools/requestsync/lp.py
@@ -20,6 +20,7 @@
 #   Please see the /usr/share/common-licenses/GPL-2 file for the full text
 #   of the GNU General Public License license.
 
+import logging
 import re
 
 from debian.deb822 import Changes
@@ -28,15 +29,13 @@ from httplib2 import Http, HttpLib2Error
 
 from ubuntutools.lp import udtexceptions
 from ubuntutools.lp.lpapicache import (
-    Launchpad,
     Distribution,
-    PersonTeam,
     DistributionSourcePackage,
+    Launchpad,
+    PersonTeam,
 )
 from ubuntutools.question import confirmation_prompt
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 
diff --git a/ubuntutools/requestsync/mail.py b/ubuntutools/requestsync/mail.py
index f5e53f4..c3b4d94 100644
--- a/ubuntutools/requestsync/mail.py
+++ b/ubuntutools/requestsync/mail.py
@@ -20,12 +20,13 @@
 #   Please see the /usr/share/common-licenses/GPL-2 file for the full text
 #   of the GNU General Public License license.
 
+import logging
 import os
 import re
-import sys
 import smtplib
 import socket
 import subprocess
+import sys
 import tempfile
 
 from debian.changelog import Changelog
@@ -33,9 +34,7 @@ from distro_info import DebianDistroInfo, DistroDataOutdated
 
 from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage
 from ubuntutools.lp.udtexceptions import PackageNotFoundException
-from ubuntutools.question import confirmation_prompt, YesNoQuestion
-
-import logging
+from ubuntutools.question import YesNoQuestion, confirmation_prompt
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/sponsor_patch/bugtask.py b/ubuntutools/sponsor_patch/bugtask.py
index f91020a..3c7fe1a 100644
--- a/ubuntutools/sponsor_patch/bugtask.py
+++ b/ubuntutools/sponsor_patch/bugtask.py
@@ -15,6 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import logging
 import os
 import re
 from urllib.parse import unquote
@@ -25,8 +26,6 @@ import httplib2
 
 from ubuntutools.version import Version
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 
diff --git a/ubuntutools/sponsor_patch/patch.py b/ubuntutools/sponsor_patch/patch.py
index d6aa8de..ed1bfdc 100644
--- a/ubuntutools/sponsor_patch/patch.py
+++ b/ubuntutools/sponsor_patch/patch.py
@@ -15,14 +15,13 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import logging
 import os
 import re
 import subprocess
-
-from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
 from functools import reduce
 
-import logging
+from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/sponsor_patch/source_package.py b/ubuntutools/sponsor_patch/source_package.py
index bad9ac8..b5fcf88 100644
--- a/ubuntutools/sponsor_patch/source_package.py
+++ b/ubuntutools/sponsor_patch/source_package.py
@@ -15,6 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import logging
 import os
 import re
 import subprocess
@@ -24,15 +25,12 @@ import debian.changelog
 import debian.deb822
 
 from ubuntutools.question import Question, YesNoQuestion
-
 from ubuntutools.sponsor_patch.question import (
     ask_for_ignoring_or_fixing,
     ask_for_manual_fixing,
     user_abort,
 )
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 
diff --git a/ubuntutools/sponsor_patch/sponsor_patch.py b/ubuntutools/sponsor_patch/sponsor_patch.py
index 9f721d8..8df13c5 100644
--- a/ubuntutools/sponsor_patch/sponsor_patch.py
+++ b/ubuntutools/sponsor_patch/sponsor_patch.py
@@ -15,6 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import logging
 import os
 import pwd
 import shutil
@@ -22,18 +23,14 @@ import subprocess
 import sys
 
 from distro_info import UbuntuDistroInfo
-
 from launchpadlib.launchpad import Launchpad
 
-from ubuntutools.update_maintainer import update_maintainer, MaintainerUpdateException
 from ubuntutools.question import input_number
-
 from ubuntutools.sponsor_patch.bugtask import BugTask, is_sync
 from ubuntutools.sponsor_patch.patch import Patch
 from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
 from ubuntutools.sponsor_patch.source_package import SourcePackage
-
-import logging
+from ubuntutools.update_maintainer import MaintainerUpdateException, update_maintainer
 
 Logger = logging.getLogger(__name__)
 
diff --git a/ubuntutools/test/example_package.py b/ubuntutools/test/example_package.py
index 94ea686..ae8e848 100644
--- a/ubuntutools/test/example_package.py
+++ b/ubuntutools/test/example_package.py
@@ -17,8 +17,8 @@
 import os
 import subprocess
 import tempfile
-
 from pathlib import Path
+
 from ubuntutools.version import Version
 
 
diff --git a/ubuntutools/test/test_archive.py b/ubuntutools/test/test_archive.py
index 3912748..9987714 100644
--- a/ubuntutools/test/test_archive.py
+++ b/ubuntutools/test/test_archive.py
@@ -18,11 +18,9 @@
 import filecmp
 import tempfile
 import unittest
-
-import ubuntutools.archive
-
 from pathlib import Path
 
+import ubuntutools.archive
 from ubuntutools.test.example_package import ExamplePackage
 
 
diff --git a/ubuntutools/test/test_config.py b/ubuntutools/test/test_config.py
index dcf2da5..ff15fc9 100644
--- a/ubuntutools/test/test_config.py
+++ b/ubuntutools/test/test_config.py
@@ -18,7 +18,6 @@
 import locale
 import os
 import unittest
-
 from io import StringIO
 from unittest import mock
 
diff --git a/ubuntutools/test/test_help.py b/ubuntutools/test/test_help.py
index 03fd956..0700d8d 100644
--- a/ubuntutools/test/test_help.py
+++ b/ubuntutools/test/test_help.py
@@ -19,7 +19,6 @@ import unittest
 
 from setup import scripts
 
-
 TIMEOUT = 10
 
 
diff --git a/ubuntutools/test/test_update_maintainer.py b/ubuntutools/test/test_update_maintainer.py
index 5f32f8f..7c32fef 100644
--- a/ubuntutools/test/test_update_maintainer.py
+++ b/ubuntutools/test/test_update_maintainer.py
@@ -18,7 +18,6 @@
 
 import os
 import unittest
-
 from io import StringIO
 from unittest import mock
 
diff --git a/ubuntutools/update_maintainer.py b/ubuntutools/update_maintainer.py
index e5856f4..25e9232 100644
--- a/ubuntutools/update_maintainer.py
+++ b/ubuntutools/update_maintainer.py
@@ -16,13 +16,12 @@
 
 """This module is for updating the Maintainer field of an Ubuntu package."""
 
+import logging
 import os
 import re
 
 import debian.changelog
 
-import logging
-
 Logger = logging.getLogger(__name__)
 
 # Prior May 2009 these Maintainers were used:
diff --git a/update-maintainer b/update-maintainer
index 3aa82bf..fd72edf 100755
--- a/update-maintainer
+++ b/update-maintainer
@@ -19,9 +19,9 @@ import os
 import sys
 
 from ubuntutools.update_maintainer import (
-    update_maintainer,
-    restore_maintainer,
     MaintainerUpdateException,
+    restore_maintainer,
+    update_maintainer,
 )