diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py
index 2c27b18..2634bc9 100644
--- a/basicswap/basicswap.py
+++ b/basicswap/basicswap.py
@@ -166,7 +166,6 @@ import basicswap.network.network as bsn
 import basicswap.protocols.atomic_swap_1 as atomic_swap_1
 import basicswap.protocols.xmr_swap_1 as xmr_swap_1
 
-
 PROTOCOL_VERSION_SECRET_HASH = 5
 MINPROTO_VERSION_SECRET_HASH = 4
 
@@ -13811,8 +13810,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             num_watched_outputs += len(v["watched_outputs"])
 
         now: int = self.getTime()
-        q_bids_str: str = (
-            """SELECT
+        q_bids_str: str = """SELECT
                COUNT(CASE WHEN b.was_sent THEN 1 ELSE NULL END) AS count_sent,
                COUNT(CASE WHEN b.was_sent AND (s.in_progress OR (s.swap_ended = 0 AND b.expire_at > :now AND o.expire_at > :now)) THEN 1 ELSE NULL END) AS count_sent_active,
                COUNT(CASE WHEN b.was_received THEN 1 ELSE NULL END) AS count_received,
@@ -13822,15 +13820,12 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                JOIN offers o ON b.offer_id = o.offer_id
                JOIN bidstates s ON b.state = s.state_id
                WHERE b.active_ind = 1"""
-        )
 
-        q_offers_str: str = (
-            """SELECT
+        q_offers_str: str = """SELECT
                COUNT(CASE WHEN expire_at > :now THEN 1 ELSE NULL END) AS count_active,
                COUNT(CASE WHEN was_sent THEN 1 ELSE NULL END) AS count_sent,
                COUNT(CASE WHEN was_sent AND expire_at > :now THEN 1 ELSE NULL END) AS count_sent_active
                FROM offers WHERE active_ind = 1"""
-        )
 
         try:
             cursor = self.openDB()
diff --git a/basicswap/db.py b/basicswap/db.py
index c3bdc47..d310f44 100644
--- a/basicswap/db.py
+++ b/basicswap/db.py
@@ -12,7 +12,6 @@ import time
 from enum import IntEnum, auto
 from typing import Optional
 
-
 CURRENT_DB_VERSION = 34
 CURRENT_DB_DATA_VERSION = 8
 
diff --git a/basicswap/explorers.py b/basicswap/explorers.py
index b34f254..fcc2035 100644
--- a/basicswap/explorers.py
+++ b/basicswap/explorers.py
@@ -7,7 +7,6 @@
 
 import json
 
-
 default_coingecko_api_key = "CG-8hm3r9iLfpEXv4ied8oLbeUj"
 
 
diff --git a/basicswap/interface/btc.py b/basicswap/interface/btc.py
index d9121af..5704c76 100644
--- a/basicswap/interface/btc.py
+++ b/basicswap/interface/btc.py
@@ -99,7 +99,6 @@ from basicswap.basicswap_util import TxLockTypes
 from basicswap.chainparams import Coins
 from basicswap.rpc import make_rpc_func, openrpc
 
-
 SEQUENCE_LOCKTIME_GRANULARITY = 9  # 512 seconds
 SEQUENCE_LOCKTIME_TYPE_FLAG = 1 << 22
 SEQUENCE_LOCKTIME_MASK = 0x0000FFFF
diff --git a/basicswap/interface/dcr/dcr.py b/basicswap/interface/dcr/dcr.py
index ded8ad5..c200c2d 100644
--- a/basicswap/interface/dcr/dcr.py
+++ b/basicswap/interface/dcr/dcr.py
@@ -82,7 +82,6 @@ from coincurve.ecdsaotves import (
     ecdsaotves_rec_enc_key,
 )
 
-
 SEQUENCE_LOCKTIME_GRANULARITY = 9  # 512 seconds
 SEQUENCE_LOCKTIME_TYPE_FLAG = 1 << 22
 SEQUENCE_LOCKTIME_MASK = 0x0000F
diff --git a/basicswap/interface/dcr/util.py b/basicswap/interface/dcr/util.py
index b49de29..ffff96b 100644
--- a/basicswap/interface/dcr/util.py
+++ b/basicswap/interface/dcr/util.py
@@ -13,7 +13,7 @@ import subprocess
 def createDCRWallet(args, hex_seed, logging, delay_event):
     logging.info("Creating DCR wallet")
 
-    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
+    pipe_r, pipe_w = os.pipe()  # subprocess.PIPE is buffered, blocks when read
 
     if os.name == "nt":
         str_args = " ".join(args)
diff --git a/basicswap/interface/xmr.py b/basicswap/interface/xmr.py
index 0ce9de2..d30e93a 100644
--- a/basicswap/interface/xmr.py
+++ b/basicswap/interface/xmr.py
@@ -34,7 +34,6 @@ from basicswap.rpc_xmr import make_xmr_rpc_func, make_xmr_rpc2_func
 from basicswap.chainparams import XMR_COIN, Coins
 from basicswap.interface.base import CoinInterface
 
-
 ed25519_l = 2**252 + 27742317777372353535851937790883648493
 
 
diff --git a/basicswap/messages_npb.py b/basicswap/messages_npb.py
index c513714..4192fb9 100644
--- a/basicswap/messages_npb.py
+++ b/basicswap/messages_npb.py
@@ -23,7 +23,6 @@ protobuf ParseFromString would reset the whole object, from_bytes won't.
 
 from basicswap.util.integer import encode_varint, decode_varint
 
-
 NPBW_INT = 0
 NPBW_BYTES = 2
 
diff --git a/basicswap/network/network.py b/basicswap/network/network.py
index 7e424a3..53f20df 100644
--- a/basicswap/network/network.py
+++ b/basicswap/network/network.py
@@ -39,7 +39,6 @@ from basicswap.contrib.rfc6979 import (
     rfc6979_hmac_sha256_generate,
 )
 
-
 START_TOKEN = 0xABCD
 MSG_START_TOKEN = START_TOKEN.to_bytes(2, "big")
 
diff --git a/basicswap/network/simplex_chat.py b/basicswap/network/simplex_chat.py
index 987239d..cbd47b6 100644
--- a/basicswap/network/simplex_chat.py
+++ b/basicswap/network/simplex_chat.py
@@ -53,7 +53,7 @@ def initSimplexClient(args, logger, delay_event):
     # TODO: Must be a better way?
     logger.info("Initialising Simplex client")
 
-    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
+    pipe_r, pipe_w = os.pipe()  # subprocess.PIPE is buffered, blocks when read
 
     if os.name == "nt":
         str_args = " ".join(args)
diff --git a/basicswap/util/__init__.py b/basicswap/util/__init__.py
index b8d1b37..b29f4bd 100644
--- a/basicswap/util/__init__.py
+++ b/basicswap/util/__init__.py
@@ -10,7 +10,6 @@ import json
 import time
 import decimal
 
-
 COIN = 100000000
 
 
diff --git a/basicswap/util/smsg.py b/basicswap/util/smsg.py
index 3bdcd7e..3422b54 100644
--- a/basicswap/util/smsg.py
+++ b/basicswap/util/smsg.py
@@ -25,7 +25,6 @@ from basicswap.contrib.test_framework.messages import (
     uint256_from_str,
 )
 
-
 AES_BLOCK_SIZE = 16
 
 
diff --git a/tests/basicswap/common.py b/tests/basicswap/common.py
index 5f0c2af..066549f 100644
--- a/tests/basicswap/common.py
+++ b/tests/basicswap/common.py
@@ -21,7 +21,6 @@ from basicswap.util import toBool
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 from basicswap.bin.prepare import downloadPIVXParams
 
-
 TEST_HTTP_HOST = os.getenv(
     "TEST_HTTP_HOST", "127.0.0.1"
 )  # Set to 0.0.0.0 when used in docker
diff --git a/tests/basicswap/common_xmr.py b/tests/basicswap/common_xmr.py
index 9ef8179..b4de182 100644
--- a/tests/basicswap/common_xmr.py
+++ b/tests/basicswap/common_xmr.py
@@ -56,7 +56,6 @@ from tests.basicswap.extended.test_doge import (
 import basicswap.config as cfg
 import basicswap.bin.run as runSystem
 
-
 TEST_PATH = os.path.expanduser(os.getenv("TEST_PATH", "~/test_basicswap1"))
 
 PARTICL_PORT_BASE = int(os.getenv("PARTICL_PORT_BASE", BASE_PORT))
diff --git a/tests/basicswap/extended/test_dash.py b/tests/basicswap/extended/test_dash.py
index 59fca97..c052f78 100644
--- a/tests/basicswap/extended/test_dash.py
+++ b/tests/basicswap/extended/test_dash.py
@@ -65,7 +65,6 @@ from tests.basicswap.common import (
 )
 from basicswap.bin.run import startDaemon
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
diff --git a/tests/basicswap/extended/test_doge_with_prepare.py b/tests/basicswap/extended/test_doge_with_prepare.py
index 80712a7..7402732 100644
--- a/tests/basicswap/extended/test_doge_with_prepare.py
+++ b/tests/basicswap/extended/test_doge_with_prepare.py
@@ -34,7 +34,6 @@ from tests.basicswap.util import (
     read_json_api,
 )
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
diff --git a/tests/basicswap/extended/test_key_paths.py b/tests/basicswap/extended/test_key_paths.py
index 8dcc16d..3c66b37 100644
--- a/tests/basicswap/extended/test_key_paths.py
+++ b/tests/basicswap/extended/test_key_paths.py
@@ -31,7 +31,6 @@ from tests.basicswap.util import (
     waitForServer,
 )
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
diff --git a/tests/basicswap/extended/test_network.py b/tests/basicswap/extended/test_network.py
index 6b1a109..d9725ff 100644
--- a/tests/basicswap/extended/test_network.py
+++ b/tests/basicswap/extended/test_network.py
@@ -58,7 +58,6 @@ from tests.basicswap.common import (
 
 from basicswap.bin.run import startDaemon
 
-
 logger = logging.getLogger()
 
 NUM_NODES = 3
diff --git a/tests/basicswap/extended/test_nmc.py b/tests/basicswap/extended/test_nmc.py
index bfac72d..a7e33df 100644
--- a/tests/basicswap/extended/test_nmc.py
+++ b/tests/basicswap/extended/test_nmc.py
@@ -40,7 +40,6 @@ from tests.basicswap.extended.test_dcr import (
     run_test_itx_refund,
 )
 
-
 logger = logging.getLogger("BSX Tests")
 
 if not len(logger.handlers):
diff --git a/tests/basicswap/extended/test_pivx.py b/tests/basicswap/extended/test_pivx.py
index 9102dc0..49381db 100644
--- a/tests/basicswap/extended/test_pivx.py
+++ b/tests/basicswap/extended/test_pivx.py
@@ -66,7 +66,6 @@ from tests.basicswap.common import (
 from basicswap.bin.run import startDaemon
 from basicswap.bin.prepare import downloadPIVXParams
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
diff --git a/tests/basicswap/extended/test_scripts.py b/tests/basicswap/extended/test_scripts.py
index f9bc46c..d1b49ca 100644
--- a/tests/basicswap/extended/test_scripts.py
+++ b/tests/basicswap/extended/test_scripts.py
@@ -38,7 +38,6 @@ from tests.basicswap.util import (
     waitForServer,
 )
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
diff --git a/tests/basicswap/selenium/test_recover_chain_b_lock_tx.py b/tests/basicswap/selenium/test_recover_chain_b_lock_tx.py
index 2162fe1..be49a9d 100644
--- a/tests/basicswap/selenium/test_recover_chain_b_lock_tx.py
+++ b/tests/basicswap/selenium/test_recover_chain_b_lock_tx.py
@@ -20,7 +20,6 @@ from util import (
 )
 from tests.basicswap.util import read_json_api
 
-
 base_url = "http://localhost"
 
 
diff --git a/tests/basicswap/selenium/test_swap_direction.py b/tests/basicswap/selenium/test_swap_direction.py
index 78051ec..82f38b3 100644
--- a/tests/basicswap/selenium/test_swap_direction.py
+++ b/tests/basicswap/selenium/test_swap_direction.py
@@ -16,7 +16,6 @@ from tests.basicswap.util import (
 from util import get_driver
 from selenium.webdriver.common.by import By
 
-
 logger = logging.getLogger()
 logger.level = logging.INFO
 if not len(logger.handlers):
diff --git a/tests/basicswap/selenium/util.py b/tests/basicswap/selenium/util.py
index 74708ec..5bf0f07 100644
--- a/tests/basicswap/selenium/util.py
+++ b/tests/basicswap/selenium/util.py
@@ -9,7 +9,6 @@
 import os
 from selenium.webdriver.common.by import By
 
-
 BSX_0_PORT = int(os.getenv("BSX_0_PORT", 12701))
 BSX_1_PORT = int(os.getenv("BSX_1_PORT", BSX_0_PORT + 1))
 BSX_2_PORT = int(os.getenv("BSX_1_PORT", BSX_0_PORT + 2))
diff --git a/tests/basicswap/test_other.py b/tests/basicswap/test_other.py
index d8d7035..20c85c2 100644
--- a/tests/basicswap/test_other.py
+++ b/tests/basicswap/test_other.py
@@ -61,7 +61,6 @@ from basicswap.contrib.test_framework.messages import (
     uint256_from_str,
 )
 
-
 logger = logging.getLogger()
 
 
diff --git a/tests/basicswap/test_run.py b/tests/basicswap/test_run.py
index e56bb58..a6266f4 100644
--- a/tests/basicswap/test_run.py
+++ b/tests/basicswap/test_run.py
@@ -63,7 +63,6 @@ from basicswap.contrib.test_framework.script import (
 )
 from tests.basicswap.test_xmr import BaseTest, test_delay_event, callnoderpc
 
-
 logger = logging.getLogger()
 
 
diff --git a/tests/basicswap/test_xmr.py b/tests/basicswap/test_xmr.py
index 92d5525..01e439d 100644
--- a/tests/basicswap/test_xmr.py
+++ b/tests/basicswap/test_xmr.py
@@ -91,7 +91,6 @@ from basicswap.db_util import (
 )
 from basicswap.bin.run import startDaemon, startXmrDaemon, startXmrWalletDaemon
 
-
 logger = logging.getLogger()
 
 NUM_NODES = 3
diff --git a/tests/basicswap/util.py b/tests/basicswap/util.py
index 3b55a2e..04948d1 100644
--- a/tests/basicswap/util.py
+++ b/tests/basicswap/util.py
@@ -10,7 +10,6 @@ import json
 import urllib
 from urllib.request import urlopen
 
-
 REQUIRED_SETTINGS = {
     "blocks_confirmed": 1,
     "conf_target": 1,