diff --git a/gotran/codegeneration/codecomponent.py b/gotran/codegeneration/codecomponent.py
index e956d11..5e3d8a6 100644
--- a/gotran/codegeneration/codecomponent.py
+++ b/gotran/codegeneration/codecomponent.py
@@ -521,9 +521,11 @@ def _body_from_cse(self, **results):
             result_expr_map[result_expr].append(
                 (
                     result_names[orig_result_expr],
-                    orig_result_expr.indices
-                    if isinstance(orig_result_expr, IndexedExpression)
-                    else ind,
+                    (
+                        orig_result_expr.indices
+                        if isinstance(orig_result_expr, IndexedExpression)
+                        else ind
+                    ),
                 ),
             )
 
diff --git a/gotran/codegeneration/codegenerators.py b/gotran/codegeneration/codegenerators.py
index 96d7c83..616d68f 100644
--- a/gotran/codegeneration/codegenerators.py
+++ b/gotran/codegeneration/codegenerators.py
@@ -770,10 +770,12 @@ def function_code(self, comp, indent=0, include_signature=True):
             body_lines.append(
                 "return {0}".format(
                     ", ".join(
-                        result_name
-                        if len(comp.shapes[result_name]) >= 1
-                        and comp.shapes[result_name][0] > 1
-                        else result_name + "[0]"
+                        (
+                            result_name
+                            if len(comp.shapes[result_name]) >= 1
+                            and comp.shapes[result_name][0] > 1
+                            else result_name + "[0]"
+                        )
                         for result_name in comp.results
                     ),
                 ),
@@ -4220,10 +4222,12 @@ def function_code(self, comp, indent=0, include_signature=True):
             body_lines.append(
                 "return {0}".format(
                     ", ".join(
-                        result_name
-                        if len(comp.shapes[result_name]) >= 1
-                        and comp.shapes[result_name][0] > 1
-                        else result_name + "[0]"
+                        (
+                            result_name
+                            if len(comp.shapes[result_name]) >= 1
+                            and comp.shapes[result_name][0] > 1
+                            else result_name + "[0]"
+                        )
                         for result_name in comp.results
                     ),
                 ),
diff --git a/gotran/input/cellml.py b/gotran/input/cellml.py
index b6dc9e2..8d16e2b 100644
--- a/gotran/input/cellml.py
+++ b/gotran/input/cellml.py
@@ -1736,9 +1736,11 @@ def unders_score_replace(comp):
                     "{0} = {1}{2}".format(
                         eq.name,
                         "".join(eq.expr),
-                        " # {0}".format(comp.variable_info[eq.name]["unit"])
-                        if comp.variable_info[eq.name]["unit"] != "1"
-                        else "",
+                        (
+                            " # {0}".format(comp.variable_info[eq.name]["unit"])
+                            if comp.variable_info[eq.name]["unit"] != "1"
+                            else ""
+                        ),
                     )
                     for eq in comp.equations
                 )
diff --git a/gotran/model/ode.py b/gotran/model/ode.py
index 4096517..235a912 100644
--- a/gotran/model/ode.py
+++ b/gotran/model/ode.py
@@ -891,9 +891,9 @@ def mass_matrix(self):
             self._mass_matrix = sp.Matrix(
                 N,
                 N,
-                lambda i, j: 1
-                if i == j and isinstance(state_exprs[i], StateDerivative)
-                else 0,
+                lambda i, j: (
+                    1 if i == j and isinstance(state_exprs[i], StateDerivative) else 0
+                ),
             )
 
         return self._mass_matrix
diff --git a/sandbox/gpu/testeverything.py b/sandbox/gpu/testeverything.py
index 4783561..3232c32 100644
--- a/sandbox/gpu/testeverything.py
+++ b/sandbox/gpu/testeverything.py
@@ -222,8 +222,7 @@ def testThreadsPerBlock(
 
 
 def testNumNodes(
-    num_nodes=[1024 * 2**n for n in range(3, 8)]
-    + [1000 * 2**n for n in range(3, 8)],
+    num_nodes=[1024 * 2**n for n in range(3, 8)] + [1000 * 2**n for n in range(3, 8)],
     dt=0.1,
     tstop=300.0,
     solver="rush_larsen",
diff --git a/tests/codegeneration/test_codegeneration.py b/tests/codegeneration/test_codegeneration.py
index 93038c0..b3e48a4 100644
--- a/tests/codegeneration/test_codegeneration.py
+++ b/tests/codegeneration/test_codegeneration.py
@@ -1,4 +1,5 @@
 """test for odecomponent module"""
+
 # Imports for evaluation of generated code
 import importlib
 from pathlib import Path
diff --git a/tests/model/test_ode.py b/tests/model/test_ode.py
index ce352e6..2aad499 100644
--- a/tests/model/test_ode.py
+++ b/tests/model/test_ode.py
@@ -1,4 +1,5 @@
 """test for odecomponent module"""
+
 # import unittest
 import os
 from pathlib import Path
diff --git a/tests/model/test_odeobjects.py b/tests/model/test_odeobjects.py
index 172916c..fed1ecb 100644
--- a/tests/model/test_odeobjects.py
+++ b/tests/model/test_odeobjects.py
@@ -1,4 +1,5 @@
 """test for odeobjects module"""
+
 import pytest
 from modelparameters.sympy import Symbol
 from modelparameters.sympytools import symbols_from_expr
diff --git a/utils/test_scripts.py b/utils/test_scripts.py
index 96ad426..b875d63 100644
--- a/utils/test_scripts.py
+++ b/utils/test_scripts.py
@@ -1,6 +1,7 @@
 """
 Run test for all scripts
 """
+
 import os
 import time