diff --git a/EDMCLogging.py b/EDMCLogging.py
index aa0a14fe..69e8389b 100644
--- a/EDMCLogging.py
+++ b/EDMCLogging.py
@@ -9,6 +9,7 @@ import sys
 import logging
 from typing import Tuple
 
+
 class Logger:
     """
     Wrapper class for all logging configuration and code.
diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 7ef9a9d7..1ea0967e 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -12,9 +12,7 @@ from os import chdir, environ
 from os.path import dirname, expanduser, isdir, join
 import re
 import html
-import requests
-from time import gmtime, time, localtime, strftime, strptime
-import _strptime	# Workaround for http://bugs.python.org/issue7980
+from time import time, localtime, strftime
 import webbrowser
 
 import EDMCLogging
@@ -212,7 +210,7 @@ class AppWindow(object):
             self.menubar.add_cascade(menu=self.help_menu)
             if platform == 'win32':
                 # Must be added after at least one "real" menu entry
-                self.always_ontop = tk.BooleanVar(value = config.getint('always_ontop'))
+                self.always_ontop = tk.BooleanVar(value=config.getint('always_ontop'))
                 self.system_menu = tk.Menu(self.menubar, name='system', tearoff=tk.FALSE)
                 self.system_menu.add_separator()
                 self.system_menu.add_checkbutton(label=_('Always on top'), variable = self.always_ontop, command=self.ontop_changed)	# Appearance setting
@@ -528,7 +526,7 @@ class AppWindow(object):
             play_bad = True
 
         if not self.status['text']:  # no errors
-            self.status['text'] = strftime(_('Last updated at {HH}:{MM}:{SS}').format(HH='%H', MM='%M', SS='%S'), localtime(querytime))
+            self.status['text'] = strftime(_('Last updated at %H:%M:%S'), localtime(querytime))
         if play_sound and play_bad:
             hotkeymgr.play_bad()
 
@@ -553,7 +551,7 @@ class AppWindow(object):
                   data.get('lastStarport', {}).get('name') == monitor.station and
                   data.get('lastStarport', {}).get('ships', {}).get('shipyard_list')):
                 self.eddn.export_shipyard(data, monitor.is_beta)
-            elif tries > 1:	# bogus data - retry
+            elif tries > 1:  # bogus data - retry
                 self.w.after(int(SERVER_RETRY * 1000), lambda:self.retry_for_shipyard(tries-1))
         except:
             pass
@@ -626,7 +624,12 @@ class AppWindow(object):
                 monitor.export_ship()
 
             # Plugins
-            err = plug.notify_journal_entry(monitor.cmdr, monitor.is_beta, monitor.system, monitor.station, entry, monitor.state)
+            err = plug.notify_journal_entry(monitor.cmdr,
+                                            monitor.is_beta,
+                                            monitor.system,
+                                            monitor.station,
+                                            entry,
+                                            monitor.state)
             if err:
                 self.status['text'] = err
                 if not config.getint('hotkey_mute'):
@@ -646,10 +649,11 @@ class AppWindow(object):
     def auth(self, event=None):
         try:
             companion.session.auth_callback()
-            self.status['text'] = _('Authentication successful')	# Successfully authenticated with the Frontier website
+            # Successfully authenticated with the Frontier website
+            self.status['text'] = _('Authentication successful')
             if platform == 'darwin':
-                self.view_menu.entryconfigure(0, state=tk.NORMAL)	# Status
-                self.file_menu.entryconfigure(0, state=tk.NORMAL)	# Save Raw Data
+                self.view_menu.entryconfigure(0, state=tk.NORMAL)  # Status
+                self.file_menu.entryconfigure(0, state=tk.NORMAL)  # Save Raw Data
             else:
                 self.file_menu.entryconfigure(0, state=tk.NORMAL)  # Status
                 self.file_menu.entryconfigure(1, state=tk.NORMAL)  # Save Raw Data
@@ -828,11 +832,19 @@ class AppWindow(object):
         try:
             data = companion.session.station()
             self.status['text'] = ''
-            f = tkinter.filedialog.asksaveasfilename(parent = self.w,
-                                               defaultextension = platform=='darwin' and '.json' or '',
-                                               filetypes = [('JSON', '.json'), ('All Files', '*')],
-                                               initialdir = config.get('outdir'),
-                                               initialfile = '%s%s.%s.json' % (data.get('lastSystem', {}).get('name', 'Unknown'), data['commander'].get('docked') and '.'+data.get('lastStarport', {}).get('name', 'Unknown') or '', strftime('%Y-%m-%dT%H.%M.%S', localtime())))
+            default_extension: str = ''
+            if platform == 'darwin':
+                default_extension = '.json'
+            last_system: str = data.get("lastSystem", {}).get("name", "Unknown")
+            last_starport: str = ''
+            if data['commander'].get('docked'):
+                last_starport = '.'+data.get('lastStarport', {}).get('name', 'Unknown')
+            timestamp: str = strftime('%Y-%m-%dT%H.%M.%S', localtime())
+            f = tkinter.filedialog.asksaveasfilename(parent=self.w,
+                                                     defaultextension=default_extension,
+                                                     filetypes=[('JSON', '.json'), ('All Files', '*')],
+                                                     initialdir=config.get('outdir'),
+                                                     initialfile=f'{last_system}{last_starport}.{timestamp}')
             if f:
                 with open(f, 'wb') as h:
                     h.write(json.dumps(data,
@@ -872,10 +884,10 @@ class AppWindow(object):
         self.drag_offset = None
 
     def oniconify(self, event=None):
-        self.w.overrideredirect(0)	# Can't iconize while overrideredirect
+        self.w.overrideredirect(0)  # Can't iconize while overrideredirect
         self.w.iconify()
-        self.w.update_idletasks()	# Size and windows styles get recalculated here
-        self.w.wait_visibility()	# Need main window to be re-created before returning
+        self.w.update_idletasks()  # Size and windows styles get recalculated here
+        self.w.wait_visibility()  # Need main window to be re-created before returning
         theme.active = None		# So theme will be re-applied on map
 
     def onmap(self, event=None):
@@ -923,9 +935,9 @@ def enforce_single_instance() -> None:
 
         def WindowTitle(h):
             if h:
-                l = GetWindowTextLength(h) + 1
-                buf = ctypes.create_unicode_buffer(l)
-                if GetWindowText(h, buf, l):
+                text_length = GetWindowTextLength(h) + 1
+                buf = ctypes.create_unicode_buffer(text_length)
+                if GetWindowText(h, buf, text_length):
                     return buf.value
             return None
 
@@ -933,7 +945,10 @@ def enforce_single_instance() -> None:
         def enumwindowsproc(hWnd, lParam):
             # class name limited to 256 - https://msdn.microsoft.com/en-us/library/windows/desktop/ms633576
             cls = ctypes.create_unicode_buffer(257)
-            if GetClassName(hWnd, cls, 257) and cls.value == 'TkTopLevel' and WindowTitle(hWnd) == applongname and GetProcessHandleFromHwnd(hWnd):
+            if GetClassName(hWnd, cls, 257)\
+                    and cls.value == 'TkTopLevel'\
+                    and WindowTitle(hWnd) == applongname\
+                    and GetProcessHandleFromHwnd(hWnd):
                 # If GetProcessHandleFromHwnd succeeds then the app is already running as this user
                 if len(sys.argv) > 1 and sys.argv[1].startswith(protocolhandler.redirect):
                     # Browser invoked us directly with auth response. Forward the response to the other app instance.
diff --git a/companion.py b/companion.py
index d1ef0481..10c6ecaf 100644
--- a/companion.py
+++ b/companion.py
@@ -7,7 +7,7 @@ import requests
 from typing import TYPE_CHECKING
 
 # TODO: see https://github.com/EDCD/EDMarketConnector/issues/569
-from http.cookiejar import LWPCookieJar  # No longer needed but retained in case plugins use it
+from http.cookiejar import LWPCookieJar  # noqa: F401 - No longer needed but retained in case plugins use it
 from email.utils import parsedate
 import hashlib
 import numbers
diff --git a/plug.py b/plug.py
index a443de21..13f187d4 100644
--- a/plug.py
+++ b/plug.py
@@ -11,7 +11,7 @@ import threading  # noqa: F401 - We don't use it, but plugins might
 import logging
 import tkinter as tk
 
-import myNotebook as nb
+import myNotebook as nb  # noqa: N813
 
 from config import config, appname
 
@@ -202,6 +202,7 @@ def load_plugins(master):
                 pass
     PLUGINS.extend(sorted(found, key=lambda p: operator.attrgetter('name')(p).lower()))
 
+
 def provides(fn_name):
     """
     Find plugins that provide a function
diff --git a/plugins/eddn.py b/plugins/eddn.py
index 1e979d48..b65ac034 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -126,7 +126,8 @@ class EDDN(object):
         except json.JSONDecodeError as e:
             # Couldn't decode - shouldn't happen!
             logger.debug(f'\n{self.replaylog[0]}\n', exc_info=e)
-            self.replaylog.pop(0)	# Discard and continue
+            # Discard and continue
+            self.replaylog.pop(0)
         else:
             # Rewrite old schema name
             if msg['$schemaRef'].startswith('http://schemas.elite-markets.net/eddn/'):
@@ -137,9 +138,9 @@ class EDDN(object):
                 if not len(self.replaylog) % self.REPLAYFLUSH:
                     self.flush()
             except requests.exceptions.RequestException as e:
-                logger.debug(f'Failed sending', exc_info=e)
+                logger.debug('Failed sending', exc_info=e)
                 status['text'] = _("Error: Can't connect to EDDN")
-                return	# stop sending
+                return  # stop sending
             except Exception as e:
                 logger.debug('Failed sending', exc_info=e)
                 status['text'] = str(e)
@@ -437,7 +438,7 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
         try:
             this.eddn.export_journal_entry(cmdr, is_beta, filter_localised(entry))
         except requests.exceptions.RequestException as e:
-            logger.debug(f'Failed in export_journal_entry', exc_info=e)
+            logger.debug('Failed in export_journal_entry', exc_info=e)
             return _("Error: Can't connect to EDDN")
         except Exception as e:
             logger.debug('Failed in export_journal_entry', exc_info=e)
diff --git a/plugins/edsm.py b/plugins/edsm.py
index 3e59404d..790f9289 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -14,7 +14,6 @@
 import json
 import requests
 import sys
-import time
 import urllib.request
 import urllib.error
 import urllib.parse
@@ -24,7 +23,7 @@ import logging
 
 import tkinter as tk
 from ttkHyperlinkLabel import HyperlinkLabel
-import myNotebook as nb
+import myNotebook as nb  # noqa: N813
 
 from config import appname, applongname, appversion, config
 import plug
@@ -380,7 +379,7 @@ def worker():
 
                 break
             except Exception as e:
-                logger.debug(f'Sending API events', exc_info=e)
+                logger.debug('Sending API events', exc_info=e)
                 retrying += 1
         else:
             plug.show_error(_("Error: Can't connect to EDSM"))
diff --git a/plugins/inara.py b/plugins/inara.py
index a0f33191..bfff9e5d 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -910,9 +910,13 @@ def worker():
                                 plug.show_error(_('Error: Inara {MSG}').format(
                                     MSG=f'{data_event["eventName"]},'
                                         f'{reply_event.get("eventStatusText", reply_event["eventStatus"])}'))
-                        if data_event['eventName'] in ['addCommanderTravelCarrierJump', 'addCommanderTravelDock', 'addCommanderTravelFSDJump', 'setCommanderTravelLocation']:
+                        if data_event['eventName'] in ('addCommanderTravelCarrierJump',
+                                                       'addCommanderTravelDock',
+                                                       'addCommanderTravelFSDJump',
+                                                       'setCommanderTravelLocation'):
                             this.lastlocation = reply_event.get('eventData', {})
-                            this.system_link.event_generate('<<InaraLocation>>', when="tail")	# calls update_location in main thread
+                            # calls update_location in main thread
+                            this.system_link.event_generate('<<InaraLocation>>', when="tail")
                         elif data_event['eventName'] in ['addCommanderShip', 'setCommanderShip']:
                             this.lastship = reply_event.get('eventData', {})
                             # calls update_ship in main thread