diff --git a/EDMCLogging.py b/EDMCLogging.py
index 49b1aa40..b6612570 100644
--- a/EDMCLogging.py
+++ b/EDMCLogging.py
@@ -258,10 +258,7 @@ def get_plugin_logger(plugin_name: str, loglevel: int = _default_loglevel) -> 'L
     :param loglevel: Optional logLevel for this Logger.
     :return: logging.Logger instance, all set up.
     """
-    if not os.getenv('EDMC_NO_UI'):
-        base_logger_name = appname
-    else:
-        base_logger_name = appcmdname
+    base_logger_name = appcmdname if os.getenv('EDMC_NO_UI') else appname
 
     plugin_logger = logging.getLogger(f'{base_logger_name}.{plugin_name}')
     plugin_logger.setLevel(loglevel)
@@ -537,10 +534,7 @@ loglevel: str | int = config.get_str('loglevel')
 if not loglevel:
     loglevel = logging.INFO
 
-if not os.getenv('EDMC_NO_UI'):
-    base_logger_name = appname
-else:
-    base_logger_name = appcmdname
+base_logger_name = appcmdname if os.getenv('EDMC_NO_UI') else appname
 
 edmclogger = Logger(base_logger_name, loglevel=loglevel)
 logger: 'LoggerMixin' = edmclogger.get_logger()
diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 28e83686..498872c5 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -748,10 +748,7 @@ class AppWindow:
         self.toggle_suit_row(visible=False)
         if args.start_min:
             logger.warning("Trying to start minimized")
-            if root.overrideredirect():
-                self.oniconify()
-            else:
-                self.w.wm_iconify()
+            self.oniconify() if root.overrideredirect() else self.w.wm_iconify()
 
     def update_suit_text(self) -> None:
         """Update the suit text for current type and loadout."""
diff --git a/collate.py b/collate.py
index bba94df1..191f2580 100755
--- a/collate.py
+++ b/collate.py
@@ -234,20 +234,8 @@ if __name__ == "__main__":
             print('No starport!')
             continue
 
-        if data['lastStarport'].get('commodities'):
-            addcommodities(data)
+        addcommodities(data) if data['lastStarport'].get('commodities') else print('No market')
 
-        else:
-            print('No market')
+        addmodules(data) if data['lastStarport'].get('modules') else print('No outfitting')
 
-        if data['lastStarport'].get('modules'):
-            addmodules(data)
-
-        else:
-            print('No outfitting')
-
-        if data['lastStarport'].get('ships'):
-            addships(data)
-
-        else:
-            print('No shipyard')
+        addships(data) if data['lastStarport'].get('ships') else print('No shipyard')
diff --git a/companion.py b/companion.py
index 9d655bc6..82db868d 100644
--- a/companion.py
+++ b/companion.py
@@ -110,11 +110,8 @@ class CAPIData(UserDict):
                 logger.debug('modules was None.  FC or Damaged Station?')
 
             elif isinstance(modules, list):
-                if not modules:
-                    logger.debug('modules is empty list. Damaged Station?')
-
-                else:
-                    logger.error(f'modules is non-empty list: {modules!r}')
+                logger.debug('modules is empty list. Damaged Station?') if not modules \
+                    else logger.error(f'modules is non-empty list: {modules!r}')
 
             else:
                 logger.error(f'modules was not None, a list, or a dict! type: {type(modules)}, content: {modules}')
@@ -543,11 +540,11 @@ class Auth:
     # noinspection PyMethodMayBeStatic
     def dump(self, r: requests.Response) -> None:
         """Dump details of HTTP failure from oAuth attempt."""
-        if r:
-            logger.debug(f'Frontier CAPI Auth: {r.url} {r.status_code} {r.reason if r.reason else "None"} {r.text}')
-
-        else:
-            logger.debug(f'Frontier CAPI Auth: failed with `r` False: {r!r}')
+        logger.debug(
+            f'Frontier CAPI Auth: {r.url} {r.status_code} {r.reason or "None"} {r.text}'
+            if r else
+            f'Frontier CAPI Auth: failed with `r` False: {r!r}'
+        )
 
     # noinspection PyMethodMayBeStatic
     def base64_url_encode(self, text: bytes) -> str:
diff --git a/plug.py b/plug.py
index 75f9eaf4..9841ee0a 100644
--- a/plug.py
+++ b/plug.py
@@ -414,11 +414,7 @@ def notify_capidata(data: companion.CAPIData, is_beta: bool) -> str | None:
     error = None
     for plugin in PLUGINS:
         # TODO: Handle it being Legacy data
-        if data.source_host == companion.SERVER_LEGACY:
-            cmdr_data = plugin._get_func('cmdr_data_legacy')
-
-        else:
-            cmdr_data = plugin._get_func('cmdr_data')
+        cmdr_data = plugin._get_func('cmdr_data_legacy' if data.source_host == companion.SERVER_LEGACY else 'cmdr_data')
 
         if cmdr_data:
             try:
diff --git a/prefs.py b/prefs.py
index 95f29e7f..436decb1 100644
--- a/prefs.py
+++ b/prefs.py
@@ -965,11 +965,9 @@ class PreferencesDialog(tk.Toplevel):
             ).grid(padx=self.PADX, pady=self.PADY, sticky=tk.W, row=row.get())
 
             for plugin in enabled_plugins:
-                if plugin.name == plugin.folder:
-                    label = nb.Label(plugins_frame, text=plugin.name)
-
-                else:
-                    label = nb.Label(plugins_frame, text=f'{plugin.folder} ({plugin.name})')
+                label = nb.Label(plugins_frame,
+                                 text=plugin.name if plugin.name == plugin.folder
+                                 else f'{plugin.folder} ({plugin.name})')
 
                 label.grid(columnspan=2, padx=self.LISTX, pady=self.PADY, sticky=tk.W, row=row.get())