diff --git a/account_banking_ach_base/__manifest__.py b/account_banking_ach_base/__manifest__.py
index 9c9abbe6..50d82279 100644
--- a/account_banking_ach_base/__manifest__.py
+++ b/account_banking_ach_base/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Localizations for North American Banking & Financials",
     "summary": "Add fields required for North American Banking & Financials",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "license": "AGPL-3",
     "author": "Thinkwell Designs, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-usa",
diff --git a/account_banking_ach_base/models/account_banking_mandate.py b/account_banking_ach_base/models/account_banking_mandate.py
index e12148d0..557a32be 100644
--- a/account_banking_ach_base/models/account_banking_mandate.py
+++ b/account_banking_ach_base/models/account_banking_mandate.py
@@ -19,7 +19,7 @@ def validate(self):
                 raise UserError(
                     _("""Delay days must be specified, and greater than 0.""")
                 )
-        return super(AccountBankingMandate, self).validate()
+        return super().validate()
 
     def set_payment_modes_on_partner(self):
         """
@@ -57,6 +57,6 @@ def set_payment_modes_on_partner(self):
 
     @api.model
     def create(self, vals):
-        mandate = super(AccountBankingMandate, self).create(vals)
+        mandate = super().create(vals)
         mandate.set_payment_modes_on_partner()
         return mandate
diff --git a/account_banking_ach_base/models/account_move.py b/account_banking_ach_base/models/account_move.py
index eb6c4315..2f5a37fa 100644
--- a/account_banking_ach_base/models/account_move.py
+++ b/account_banking_ach_base/models/account_move.py
@@ -24,4 +24,4 @@ def create_account_payment_line(self):
                     name=invoice.name,
                     delay_expired=delay_expired.strftime("%Y-%m-%d"),
                 )
-        return super(AccountMove, self).create_account_payment_line()
+        return super().create_account_payment_line()
diff --git a/account_banking_ach_base/models/account_payment_order.py b/account_banking_ach_base/models/account_payment_order.py
index 153b8912..1d618d54 100644
--- a/account_banking_ach_base/models/account_payment_order.py
+++ b/account_banking_ach_base/models/account_payment_order.py
@@ -84,7 +84,8 @@ def validate_mandates(self, line):
         if line.mandate_id.state != "valid":
             raise Warning(
                 _(
-                    "The ACH Direct Debit mandate with reference %(unique_mandate_reference)s "
+                    "The ACH Direct Debit mandate with "
+                    "reference %(unique_mandate_reference)s "
                     "for partner %(name)s has expired."
                 ),
                 unique_mandate_reference=line.mandate_id.unique_mandate_reference,
@@ -93,8 +94,8 @@ def validate_mandates(self, line):
         if line.mandate_id.type == "oneoff" and line.mandate_id.last_debit_date:
             raise Warning(
                 _(
-                    "The mandate with reference %(unique_mandate_reference)s for partner "
-                    "%(name)s has type set to 'One-Off' and it has a "
+                    "The mandate with reference %(unique_mandate_reference)s "
+                    "for partner %(name)s has type set to 'One-Off' and it has a "
                     "last debit date set to %(last_debit_date)s, so we can't use "
                     "it."
                 ),