diff --git a/python/dune/codegen/blockstructured/__init__.py b/python/dune/codegen/blockstructured/__init__.py
index f7024557b719c20aaca74275285fe605b13c57ff..138b11463a554ee58ac236d4439120172aabb640 100644
--- a/python/dune/codegen/blockstructured/__init__.py
+++ b/python/dune/codegen/blockstructured/__init__.py
@@ -8,11 +8,11 @@ from dune.codegen.options import get_form_option
 from dune.codegen.pdelab.quadrature import pymbolic_quadrature_position
 from dune.codegen.blockstructured.spaces import lfs_inames
 from dune.codegen.blockstructured.basis import (pymbolic_reference_gradient,
-                                                 pymbolic_basis)
+                                                pymbolic_basis)
 from dune.codegen.blockstructured.geometry import (pymbolic_jacobian_inverse,
-                                                    pymbolic_jacobian_determinant,
-                                                    pymbolic_facet_jacobian_determinant,
-                                                    to_global)
+                                                   pymbolic_jacobian_determinant,
+                                                   pymbolic_facet_jacobian_determinant,
+                                                   to_global)
 from dune.codegen.blockstructured.tools import sub_element_inames
 from dune.codegen.pdelab import PDELabInterface
 
diff --git a/python/dune/codegen/blockstructured/argument.py b/python/dune/codegen/blockstructured/argument.py
index 462712f105feab6cea9c3f5e5bb704ad37698a6b..afe120a8ec142820cf8ea3944538802b721f4469 100644
--- a/python/dune/codegen/blockstructured/argument.py
+++ b/python/dune/codegen/blockstructured/argument.py
@@ -1,6 +1,6 @@
 from dune.codegen.generation import (backend,
-                                      kernel_cached,
-                                      valuearg, instruction, globalarg)
+                                     kernel_cached,
+                                     valuearg, instruction, globalarg)
 from dune.codegen.options import get_form_option
 from dune.codegen.pdelab.argument import CoefficientAccess
 from dune.codegen.blockstructured.tools import micro_index_to_macro_index, sub_element_inames
diff --git a/python/dune/codegen/blockstructured/basis.py b/python/dune/codegen/blockstructured/basis.py
index de753ec6b814877e0bd7775b290af9aaa726745b..dcaf258b17e0dc4128860d3c58b9801a454f4471 100644
--- a/python/dune/codegen/blockstructured/basis.py
+++ b/python/dune/codegen/blockstructured/basis.py
@@ -1,21 +1,21 @@
 from dune.codegen.generation import (backend,
-                                      kernel_cached,
-                                      get_backend,
-                                      instruction,
-                                      temporary_variable,
-                                      globalarg,
-                                      class_member,
-                                      initializer_list,
-                                      include_file,)
+                                     kernel_cached,
+                                     get_backend,
+                                     instruction,
+                                     temporary_variable,
+                                     globalarg,
+                                     class_member,
+                                     initializer_list,
+                                     include_file,)
 from dune.codegen.tools import get_pymbolic_basename
 from dune.codegen.loopy.target import type_floatingpoint
 from dune.codegen.pdelab.basis import (declare_cache_temporary,
-                                        name_localbasis_cache,
-                                        type_localbasis,
-                                        FEM_name_mangling)
+                                       name_localbasis_cache,
+                                       type_localbasis,
+                                       FEM_name_mangling)
 from dune.codegen.pdelab.driver import (isPk,
-                                         isQk,
-                                         )
+                                        isQk,
+                                        )
 from dune.codegen.pdelab.geometry import world_dimension
 from dune.codegen.pdelab.quadrature import pymbolic_quadrature_position_in_cell
 from dune.codegen.pdelab.spaces import type_leaf_gfs
diff --git a/python/dune/codegen/blockstructured/geometry.py b/python/dune/codegen/blockstructured/geometry.py
index 3bcf6943c3ac1975995e325b0f1070635aa6f745..4f1a71d3e3674ea768ef63842ca5aa4def21db61 100644
--- a/python/dune/codegen/blockstructured/geometry.py
+++ b/python/dune/codegen/blockstructured/geometry.py
@@ -1,17 +1,17 @@
 from dune.codegen.pdelab.restriction import restricted_name
 
 from dune.codegen.generation import (get_backend,
-                                      temporary_variable,
-                                      instruction,
-                                      get_global_context_value)
+                                     temporary_variable,
+                                     instruction,
+                                     get_global_context_value)
 from dune.codegen.tools import get_pymbolic_basename
 from dune.codegen.options import (get_form_option,
-                                   option_switch, get_option)
+                                  option_switch, get_option)
 from dune.codegen.pdelab.geometry import (world_dimension,
-                                           local_dimension,
-                                           name_facet_jacobian_determinant,
-                                           name_element_corners,
-                                           component_iname)
+                                          local_dimension,
+                                          name_facet_jacobian_determinant,
+                                          name_element_corners,
+                                          component_iname)
 from dune.codegen.blockstructured.tools import sub_element_inames
 import pymbolic.primitives as prim
 from loopy.match import Writes
diff --git a/python/dune/codegen/blockstructured/quadrature.py b/python/dune/codegen/blockstructured/quadrature.py
index f23cf72e2c930cef10d5b5851776e9c076723c04..4c78d733866b79817f1d7f43189e157d8967fa76 100644
--- a/python/dune/codegen/blockstructured/quadrature.py
+++ b/python/dune/codegen/blockstructured/quadrature.py
@@ -1,6 +1,6 @@
 from dune.codegen.generation import (backend)
 from dune.codegen.pdelab.quadrature import (name_quadrature_points,
-                                             quadrature_iname)
+                                            quadrature_iname)
 from dune.codegen.blockstructured.geometry import name_point_in_macro
 import pymbolic.primitives as prim
 
diff --git a/python/dune/codegen/blockstructured/spaces.py b/python/dune/codegen/blockstructured/spaces.py
index 598d4ed6a856b2fd60ea604c6a383523c1b2b145..688b1984a7cac29922de43d2dae5ad35313cebc5 100644
--- a/python/dune/codegen/blockstructured/spaces.py
+++ b/python/dune/codegen/blockstructured/spaces.py
@@ -1,5 +1,5 @@
 from dune.codegen.generation import (backend,
-                                      domain)
+                                     domain)
 from dune.codegen.pdelab.geometry import world_dimension
 from dune.codegen.pdelab.spaces import name_leaf_lfs
 
diff --git a/python/dune/codegen/blockstructured/tools.py b/python/dune/codegen/blockstructured/tools.py
index a83adc86c8ba1664a088f1f4e84cfd323d6366da..3eafcae5914f21538766960d75dbdb2fa2e728ad 100644
--- a/python/dune/codegen/blockstructured/tools.py
+++ b/python/dune/codegen/blockstructured/tools.py
@@ -1,13 +1,13 @@
 from dune.codegen.ufl.modified_terminals import Restriction
 from dune.codegen.generation import (iname,
-                                      domain,
-                                      get_global_context_value,
-                                      temporary_variable,
-                                      instruction)
+                                     domain,
+                                     get_global_context_value,
+                                     temporary_variable,
+                                     instruction)
 from dune.codegen.pdelab.geometry import (local_dimension,
-                                           world_dimension,
-                                           name_localcenter,
-                                           pymbolic_in_cell_coordinates)
+                                          world_dimension,
+                                          name_localcenter,
+                                          pymbolic_in_cell_coordinates)
 
 from dune.codegen.pdelab.quadrature import quadrature_inames
 from dune.codegen.generation.counter import get_counted_variable
diff --git a/python/dune/codegen/compile.py b/python/dune/codegen/compile.py
index d8fcfb9faf0c3aa0137e7411463917f84aa434fc..8a6e66b09f2c22135dfe4aa1ca4c9605e07579ae 100644
--- a/python/dune/codegen/compile.py
+++ b/python/dune/codegen/compile.py
@@ -14,16 +14,16 @@ from ufl.algorithms import compute_form_data, read_ufl_file
 from ufl.algorithms.formfiles import interpret_ufl_namespace
 
 from dune.codegen.generation import (delete_cache_items,
-                                      global_context,
-                                      )
+                                     global_context,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   initialize_options,
-                                   )
+                                  get_option,
+                                  initialize_options,
+                                  )
 from dune.codegen.pdelab.driver import generate_driver
 from dune.codegen.pdelab.localoperator import (generate_localoperator_file,
-                                                generate_localoperator_kernels,
-                                                )
+                                               generate_localoperator_kernels,
+                                               )
 from dune.codegen.ufl.preprocess import preprocess_form
 
 from os.path import splitext, basename, join, dirname, abspath
diff --git a/python/dune/codegen/generation/__init__.py b/python/dune/codegen/generation/__init__.py
index adf04968406bae04b6a0faf70cf57079d539baa9..3103bac657648779921eb66c7170f5a55059e209 100644
--- a/python/dune/codegen/generation/__init__.py
+++ b/python/dune/codegen/generation/__init__.py
@@ -1,60 +1,60 @@
 from __future__ import absolute_import
 
 from dune.codegen.generation.backend import (backend,
-                                              get_backend,
-                                              )
+                                             get_backend,
+                                             )
 
 from dune.codegen.generation.counter import (get_counter,
-                                              get_counted_variable,
-                                              )
+                                             get_counted_variable,
+                                             )
 
 from dune.codegen.generation.cache import (cached,
-                                            generator_factory,
-                                            no_caching,
-                                            retrieve_cache_functions,
-                                            retrieve_cache_items,
-                                            delete_cache_items,
-                                            inspect_generator,
-                                            )
+                                           generator_factory,
+                                           no_caching,
+                                           retrieve_cache_functions,
+                                           retrieve_cache_items,
+                                           delete_cache_items,
+                                           inspect_generator,
+                                           )
 
 from dune.codegen.generation.cpp import (base_class,
-                                          class_basename,
-                                          class_member,
-                                          constructor_parameter,
-                                          dump_accumulate_timer,
-                                          end_of_file,
-                                          include_file,
-                                          initializer_list,
-                                          pre_include,
-                                          preamble,
-                                          post_include,
-                                          template_parameter,
-                                          )
+                                         class_basename,
+                                         class_member,
+                                         constructor_parameter,
+                                         dump_accumulate_timer,
+                                         end_of_file,
+                                         include_file,
+                                         initializer_list,
+                                         pre_include,
+                                         preamble,
+                                         post_include,
+                                         template_parameter,
+                                         )
 
 from dune.codegen.generation.hooks import (hook,
-                                            ReturnArg,
-                                            run_hook,
-                                            )
+                                           ReturnArg,
+                                           run_hook,
+                                           )
 
 from dune.codegen.generation.loopy import (barrier,
-                                            constantarg,
-                                            domain,
-                                            function_mangler,
-                                            get_temporary_name,
-                                            globalarg,
-                                            iname,
-                                            instruction,
-                                            loopy_class_member,
-                                            kernel_cached,
-                                            noop_instruction,
-                                            silenced_warning,
-                                            subst_rule,
-                                            temporary_variable,
-                                            transform,
-                                            valuearg,
-                                            )
+                                           constantarg,
+                                           domain,
+                                           function_mangler,
+                                           get_temporary_name,
+                                           globalarg,
+                                           iname,
+                                           instruction,
+                                           loopy_class_member,
+                                           kernel_cached,
+                                           noop_instruction,
+                                           silenced_warning,
+                                           subst_rule,
+                                           temporary_variable,
+                                           transform,
+                                           valuearg,
+                                           )
 
 from dune.codegen.generation.context import (cache_restoring,
-                                              global_context,
-                                              get_global_context_value,
-                                              )
+                                             global_context,
+                                             get_global_context_value,
+                                             )
diff --git a/python/dune/codegen/generation/cache.py b/python/dune/codegen/generation/cache.py
index a61cd2a19a7e3cd6e8e32cc55edbbe80bc72cdc4..223ab1bf6012bab7e19043a6163b936221735fe2 100644
--- a/python/dune/codegen/generation/cache.py
+++ b/python/dune/codegen/generation/cache.py
@@ -4,8 +4,8 @@ generating functions.
 import inspect
 
 from dune.codegen.generation.context import (get_global_context_value,
-                                              global_context,
-                                              )
+                                             global_context,
+                                             )
 from dune.codegen.generation.counter import get_counter
 from dune.codegen.options import get_option
 
diff --git a/python/dune/codegen/generation/loopy.py b/python/dune/codegen/generation/loopy.py
index 5685b37829588f42930770f6310d403c113c4583..47d78fb8d4ea2eb405ed57b0e0ffab10babbd7b2 100644
--- a/python/dune/codegen/generation/loopy.py
+++ b/python/dune/codegen/generation/loopy.py
@@ -2,10 +2,10 @@
 from __future__ import absolute_import
 
 from dune.codegen.generation import (get_counter,
-                                      generator_factory,
-                                      no_caching,
-                                      preamble,
-                                      )
+                                     generator_factory,
+                                     no_caching,
+                                     preamble,
+                                     )
 from dune.codegen.error import CodegenLoopyError
 
 import loopy as lp
diff --git a/python/dune/codegen/loopy/mangler.py b/python/dune/codegen/loopy/mangler.py
index a251c5356b8fa9730a610aeaed3b3c2cf7f87bf5..1f082cfddce8d378e4df98037afbe6c2925f2e92 100644
--- a/python/dune/codegen/loopy/mangler.py
+++ b/python/dune/codegen/loopy/mangler.py
@@ -1,9 +1,9 @@
 """ Function manglers for math functions in C++ """
 
 from dune.codegen.generation import (function_mangler,
-                                      include_file,
-                                      post_include
-                                      )
+                                     include_file,
+                                     post_include
+                                     )
 
 from loopy import CallMangleInfo
 from loopy.types import to_loopy_type
diff --git a/python/dune/codegen/loopy/target.py b/python/dune/codegen/loopy/target.py
index ac69903bcbbf3ddacdd0199bdbbc7ebc449863c9..b8dd4d2552fb38b753be02fd6279074b4276d825 100644
--- a/python/dune/codegen/loopy/target.py
+++ b/python/dune/codegen/loopy/target.py
@@ -6,8 +6,8 @@ from dune.codegen.generation.loopy import DuneGlobalArg
 from dune.codegen.loopy.temporary import DuneTemporaryVariable
 from dune.codegen.loopy.vcl import VCLTypeRegistry
 from dune.codegen.generation import (include_file,
-                                      retrieve_cache_functions,
-                                      )
+                                     retrieve_cache_functions,
+                                     )
 from dune.codegen.options import get_form_option, get_option
 from dune.codegen.tools import round_to_multiple
 
diff --git a/python/dune/codegen/loopy/transformations/instrumentation.py b/python/dune/codegen/loopy/transformations/instrumentation.py
index 40550a01b867031e31dc504b3eacea7312232139..7b13a09e597490dd1bef85344c9be6bdfb859dd3 100644
--- a/python/dune/codegen/loopy/transformations/instrumentation.py
+++ b/python/dune/codegen/loopy/transformations/instrumentation.py
@@ -1,8 +1,8 @@
 """ Add instrumentation instructions to a kernel """
 
 from dune.codegen.generation import (dump_accumulate_timer,
-                                      post_include,
-                                      )
+                                     post_include,
+                                     )
 from dune.codegen.options import get_option
 
 import loopy as lp
diff --git a/python/dune/codegen/loopy/transformations/vectorize_quad.py b/python/dune/codegen/loopy/transformations/vectorize_quad.py
index b8ddc39ede44df831e1ea141ac29e8e45b7cb92d..2ff6361f445ce44e73c659aa34bf7e4e7f02646b 100644
--- a/python/dune/codegen/loopy/transformations/vectorize_quad.py
+++ b/python/dune/codegen/loopy/transformations/vectorize_quad.py
@@ -2,14 +2,14 @@
 in chunks of vector size independent of divisibility of the loop bounds. """
 
 from dune.codegen.generation import (function_mangler,
-                                      include_file,
-                                      loopy_class_member,
-                                      )
+                                     include_file,
+                                     loopy_class_member,
+                                     )
 from dune.codegen.loopy.target import dtype_floatingpoint
 from dune.codegen.loopy.vcl import get_vcl_type, get_vcl_type_size
 from dune.codegen.loopy.transformations.vectorview import (add_vector_view,
-                                                            get_vector_view_name,
-                                                            )
+                                                           get_vector_view_name,
+                                                           )
 from dune.codegen.loopy.symbolic import substitute
 from dune.codegen.sumfact.quadrature import quadrature_inames
 from dune.codegen.tools import get_pymbolic_basename, get_pymbolic_tag, ceildiv
diff --git a/python/dune/codegen/pdelab/__init__.py b/python/dune/codegen/pdelab/__init__.py
index 2c9a5a833642f148914f7353b3ff26687471e083..affa0725c89539fa88e470ac143f5d76fdb8a18b 100644
--- a/python/dune/codegen/pdelab/__init__.py
+++ b/python/dune/codegen/pdelab/__init__.py
@@ -5,37 +5,37 @@
 from dune.codegen.generation import (get_backend)
 from dune.codegen.options import option_switch
 from dune.codegen.pdelab.argument import (pymbolic_apply_function,
-                                           pymbolic_apply_function_gradient,
-                                           pymbolic_trialfunction,
-                                           pymbolic_trialfunction_gradient,
-                                           pymbolic_coefficient
-                                           )
+                                          pymbolic_apply_function_gradient,
+                                          pymbolic_trialfunction,
+                                          pymbolic_trialfunction_gradient,
+                                          pymbolic_coefficient
+                                          )
 from dune.codegen.pdelab.basis import (pymbolic_basis,
-                                        pymbolic_reference_gradient,
-                                        )
+                                       pymbolic_reference_gradient,
+                                       )
 from dune.codegen.pdelab.function import pymbolic_gridfunction
 from dune.codegen.pdelab.geometry import (component_iname,
-                                           pymbolic_cell_volume,
-                                           pymbolic_facet_area,
-                                           pymbolic_facet_jacobian_determinant,
-                                           pymbolic_jacobian_determinant,
-                                           pymbolic_jacobian_inverse,
-                                           pymbolic_unit_inner_normal,
-                                           pymbolic_unit_outer_normal,
-                                           to_global,
-                                           )
+                                          pymbolic_cell_volume,
+                                          pymbolic_facet_area,
+                                          pymbolic_facet_jacobian_determinant,
+                                          pymbolic_jacobian_determinant,
+                                          pymbolic_jacobian_inverse,
+                                          pymbolic_unit_inner_normal,
+                                          pymbolic_unit_outer_normal,
+                                          to_global,
+                                          )
 from dune.codegen.pdelab.index import (name_index,
-                                        )
+                                       )
 from dune.codegen.pdelab.quadrature import (pymbolic_quadrature_weight,
-                                             pymbolic_quadrature_position,
-                                             quadrature_inames,
-                                             )
+                                            pymbolic_quadrature_position,
+                                            quadrature_inames,
+                                            )
 from dune.codegen.pdelab.spaces import (lfs_inames,
-                                         )
+                                        )
 from dune.codegen.pdelab.tensors import (pymbolic_list_tensor,
-                                          pymbolic_identity,
-                                          pymbolic_matrix_inverse,
-                                          )
+                                         pymbolic_identity,
+                                         pymbolic_matrix_inverse,
+                                         )
 
 
 class PDELabInterface(object):
diff --git a/python/dune/codegen/pdelab/adjoint.py b/python/dune/codegen/pdelab/adjoint.py
index be42bc553b2b938197996f17a6fb13e98f99fd77..2681b00391d46532a37846ab2c550f98ff5a3d96 100644
--- a/python/dune/codegen/pdelab/adjoint.py
+++ b/python/dune/codegen/pdelab/adjoint.py
@@ -9,22 +9,22 @@ from loopy.types import NumpyType
 import pymbolic.primitives as prim
 
 from dune.codegen.generation import (class_member,
-                                      constructor_parameter,
-                                      function_mangler,
-                                      get_global_context_value,
-                                      global_context,
-                                      globalarg,
-                                      initializer_list,
-                                      template_parameter,
-                                      )
+                                     constructor_parameter,
+                                     function_mangler,
+                                     get_global_context_value,
+                                     global_context,
+                                     globalarg,
+                                     initializer_list,
+                                     template_parameter,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   )
+                                  )
 from dune.codegen.loopy.target import dtype_floatingpoint
 from dune.codegen.pdelab import PDELabInterface
 from dune.codegen.pdelab.localoperator import (boundary_predicates,
-                                                determine_accumulation_space,
-                                                extract_kernel_from_cache,
-                                                )
+                                               determine_accumulation_space,
+                                               extract_kernel_from_cache,
+                                               )
 
 
 @template_parameter(classtag="operator")
diff --git a/python/dune/codegen/pdelab/argument.py b/python/dune/codegen/pdelab/argument.py
index 2e10364ba1f906a2f62675524842f7bb0d858940..ce16cd1121458ab27325312a727fd74c98d708cc 100644
--- a/python/dune/codegen/pdelab/argument.py
+++ b/python/dune/codegen/pdelab/argument.py
@@ -6,21 +6,21 @@ Namely:
 """
 
 from dune.codegen.generation import (domain,
-                                      function_mangler,
-                                      iname,
-                                      valuearg,
-                                      get_global_context_value,
-                                      kernel_cached,
-                                      backend
-                                      )
+                                     function_mangler,
+                                     iname,
+                                     valuearg,
+                                     get_global_context_value,
+                                     kernel_cached,
+                                     backend
+                                     )
 from dune.codegen.loopy.target import dtype_floatingpoint
 from dune.codegen.pdelab.index import name_index
 from dune.codegen.pdelab.basis import (evaluate_coefficient,
-                                        evaluate_coefficient_gradient,
-                                        )
+                                       evaluate_coefficient_gradient,
+                                       )
 from dune.codegen.pdelab.spaces import (lfs_iname,
-                                         name_lfs_bound,
-                                         )
+                                        name_lfs_bound,
+                                        )
 from dune.codegen.pdelab.restriction import restricted_name
 from dune.codegen.ufl.modified_terminals import Restriction
 
diff --git a/python/dune/codegen/pdelab/basis.py b/python/dune/codegen/pdelab/basis.py
index 03f786d31a885395aba31912af91c3d36b5213d3..c65e71ebfc9e3a38023033e27dc65d445734edbf 100644
--- a/python/dune/codegen/pdelab/basis.py
+++ b/python/dune/codegen/pdelab/basis.py
@@ -1,42 +1,42 @@
 """ Generators for basis evaluations """
 
 from dune.codegen.generation import (backend,
-                                      class_member,
-                                      get_backend,
-                                      include_file,
-                                      instruction,
-                                      kernel_cached,
-                                      preamble,
-                                      temporary_variable,
-                                      )
+                                     class_member,
+                                     get_backend,
+                                     include_file,
+                                     instruction,
+                                     kernel_cached,
+                                     preamble,
+                                     temporary_variable,
+                                     )
 from dune.codegen.options import (option_switch,
-                                   get_form_option,
-                                   )
+                                  get_form_option,
+                                  )
 from dune.codegen.pdelab.spaces import (lfs_iname,
-                                         lfs_inames,
-                                         name_leaf_lfs,
-                                         name_lfs,
-                                         name_lfs_bound,
-                                         type_gfs,
-                                         type_leaf_gfs,
-                                         )
+                                        lfs_inames,
+                                        name_leaf_lfs,
+                                        name_lfs,
+                                        name_lfs_bound,
+                                        type_gfs,
+                                        type_leaf_gfs,
+                                        )
 from dune.codegen.pdelab.geometry import (component_iname,
-                                           world_dimension,
-                                           name_jacobian_inverse_transposed,
-                                           to_cell_coordinates,
-                                           name_cell,
-                                           )
+                                          world_dimension,
+                                          name_jacobian_inverse_transposed,
+                                          to_cell_coordinates,
+                                          name_cell,
+                                          )
 from dune.codegen.pdelab.localoperator import (lop_template_ansatz_gfs,
-                                                lop_template_test_gfs,
-                                                )
+                                               lop_template_test_gfs,
+                                               )
 from dune.codegen.tools import (get_pymbolic_basename,
-                                 get_pymbolic_indices,
-                                 )
+                                get_pymbolic_indices,
+                                )
 from dune.codegen.pdelab.driver import FEM_name_mangling
 from dune.codegen.pdelab.restriction import restricted_name
 from dune.codegen.pdelab.driver import (isPk,
-                                         isQk,
-                                         isDG)
+                                        isQk,
+                                        isDG)
 
 from pymbolic.primitives import Product, Subscript, Variable
 
diff --git a/python/dune/codegen/pdelab/driver/__init__.py b/python/dune/codegen/pdelab/driver/__init__.py
index 0d67a842fcfe13b10c5948f938d5e8c3db0e1b4d..6526dcbf85cfb60d663a3f0193dde07351a361bd 100644
--- a/python/dune/codegen/pdelab/driver/__init__.py
+++ b/python/dune/codegen/pdelab/driver/__init__.py
@@ -12,16 +12,16 @@ NB: Previously this __init__.py was a module driver.py. As it was growing,
 """
 from dune.codegen.error import CodegenCodegenError
 from dune.codegen.generation import (generator_factory,
-                                      get_global_context_value,
-                                      global_context,
-                                      include_file,
-                                      cached,
-                                      pre_include,
-                                      preamble,
-                                      )
+                                     get_global_context_value,
+                                     global_context,
+                                     include_file,
+                                     cached,
+                                     pre_include,
+                                     preamble,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 
 #
 # The following functions are not doing anything useful, but providing easy access
diff --git a/python/dune/codegen/pdelab/driver/constraints.py b/python/dune/codegen/pdelab/driver/constraints.py
index 2b75995813f19b56494afb0054ddabcbb93c59d6..b903b49fbd128d9ab0ee104ef8ad4441a87e1ead 100644
--- a/python/dune/codegen/pdelab/driver/constraints.py
+++ b/python/dune/codegen/pdelab/driver/constraints.py
@@ -1,18 +1,18 @@
 from dune.codegen.generation import (get_counted_variable,
-                                      global_context,
-                                      include_file,
-                                      preamble,
-                                      )
+                                     global_context,
+                                     include_file,
+                                     preamble,
+                                     )
 from dune.codegen.pdelab.driver import (FEM_name_mangling,
-                                         get_trial_element,
-                                         )
+                                        get_trial_element,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_gfs,
-                                                           name_leafview,
-                                                           name_trial_gfs,
-                                                           type_range,
-                                                           type_trial_gfs,
-                                                           preprocess_leaf_data,
-                                                           )
+                                                          name_leafview,
+                                                          name_trial_gfs,
+                                                          type_range,
+                                                          type_trial_gfs,
+                                                          preprocess_leaf_data,
+                                                          )
 
 from ufl.classes import Expr
 from ufl import FiniteElement, MixedElement, TensorElement, VectorElement, TensorProductElement
diff --git a/python/dune/codegen/pdelab/driver/error.py b/python/dune/codegen/pdelab/driver/error.py
index bf312eb24db6e97be011631942aad3da4f3f0ac1..cf9fe42933ca41f2696b39324bb4f443c35d9003 100644
--- a/python/dune/codegen/pdelab/driver/error.py
+++ b/python/dune/codegen/pdelab/driver/error.py
@@ -1,26 +1,26 @@
 """ Generator functions to calculate errors in the driver """
 
 from dune.codegen.generation import (cached,
-                                      include_file,
-                                      preamble,
-                                      )
+                                     include_file,
+                                     preamble,
+                                     )
 from dune.codegen.options import get_option
 from dune.codegen.pdelab.driver import (get_form_ident,
-                                         get_trial_element,
-                                         preprocess_leaf_data,
-                                         )
+                                        get_trial_element,
+                                        preprocess_leaf_data,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_leafview,
-                                                           name_trial_gfs,
-                                                           name_trial_subgfs,
-                                                           type_range,
-                                                           )
+                                                          name_trial_gfs,
+                                                          name_trial_subgfs,
+                                                          type_range,
+                                                          )
 from dune.codegen.pdelab.driver.interpolate import (interpolate_vector,
-                                                     name_boundary_function,
-                                                     )
+                                                    name_boundary_function,
+                                                    )
 from dune.codegen.pdelab.driver.solve import (define_vector,
-                                               dune_solve,
-                                               name_vector,
-                                               )
+                                              dune_solve,
+                                              name_vector,
+                                              )
 from ufl import MixedElement, TensorElement, VectorElement
 
 
diff --git a/python/dune/codegen/pdelab/driver/gridfunctionspace.py b/python/dune/codegen/pdelab/driver/gridfunctionspace.py
index d2ff0a66cd9adbc9d31c91680614e8cd1148ea92..991b770fde66c26c40e713a04e2c05df181ae357 100644
--- a/python/dune/codegen/pdelab/driver/gridfunctionspace.py
+++ b/python/dune/codegen/pdelab/driver/gridfunctionspace.py
@@ -1,23 +1,23 @@
 from dune.codegen.generation import (include_file,
-                                      preamble,
-                                      )
+                                     preamble,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 from dune.codegen.pdelab.driver import (FEM_name_mangling,
-                                         get_cell,
-                                         get_dimension,
-                                         get_test_element,
-                                         get_trial_element,
-                                         isLagrange,
-                                         isDG,
-                                         isPk,
-                                         isQk,
-                                         isQuadrilateral,
-                                         isSimplical,
-                                         name_initree,
-                                         preprocess_leaf_data,
-                                         )
+                                        get_cell,
+                                        get_dimension,
+                                        get_test_element,
+                                        get_trial_element,
+                                        isLagrange,
+                                        isDG,
+                                        isPk,
+                                        isQk,
+                                        isQuadrilateral,
+                                        isSimplical,
+                                        name_initree,
+                                        preprocess_leaf_data,
+                                        )
 from dune.codegen.loopy.target import type_floatingpoint
 
 from ufl import FiniteElement, MixedElement, TensorElement, VectorElement, TensorProductElement
diff --git a/python/dune/codegen/pdelab/driver/gridoperator.py b/python/dune/codegen/pdelab/driver/gridoperator.py
index 72813582fb9ab98c2c15e3636d9629e25188977b..abc878f0715dbcb4a0501d56247c4f03c98f20df 100644
--- a/python/dune/codegen/pdelab/driver/gridoperator.py
+++ b/python/dune/codegen/pdelab/driver/gridoperator.py
@@ -1,25 +1,25 @@
 from dune.codegen.generation import (get_global_context_value,
-                                      include_file,
-                                      preamble,
-                                      )
+                                     include_file,
+                                     preamble,
+                                     )
 from dune.codegen.pdelab.driver import (get_cell,
-                                         get_dimension,
-                                         get_test_element,
-                                         get_trial_element,
-                                         isQuadrilateral,
-                                         name_initree,
-                                         )
+                                        get_dimension,
+                                        get_test_element,
+                                        get_trial_element,
+                                        isQuadrilateral,
+                                        name_initree,
+                                        )
 from dune.codegen.pdelab.driver.constraints import (name_assembled_constraints,
-                                                     type_constraintscontainer,
-                                                     )
+                                                    type_constraintscontainer,
+                                                    )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_test_gfs,
-                                                           name_trial_gfs,
-                                                           preprocess_leaf_data,
-                                                           type_domainfield,
-                                                           type_range,
-                                                           type_test_gfs,
-                                                           type_trial_gfs,
-                                                           )
+                                                          name_trial_gfs,
+                                                          preprocess_leaf_data,
+                                                          type_domainfield,
+                                                          type_range,
+                                                          type_test_gfs,
+                                                          type_trial_gfs,
+                                                          )
 from dune.codegen.pdelab.localoperator import localoperator_basename
 from dune.codegen.options import get_form_option
 
diff --git a/python/dune/codegen/pdelab/driver/instationary.py b/python/dune/codegen/pdelab/driver/instationary.py
index 499b3f7488f396f8f7a0792f90e2f24a707bbb4c..5cf7170f1dca6f4274db4bf77b4b1627466e20cb 100644
--- a/python/dune/codegen/pdelab/driver/instationary.py
+++ b/python/dune/codegen/pdelab/driver/instationary.py
@@ -1,41 +1,41 @@
 from dune.codegen.generation import (include_file,
-                                      preamble,
-                                      )
+                                     preamble,
+                                     )
 from dune.codegen.pdelab.driver import (get_form_ident,
-                                         get_trial_element,
-                                         is_linear,
-                                         name_initree,
-                                         preprocess_leaf_data,
-                                         )
+                                        get_trial_element,
+                                        is_linear,
+                                        name_initree,
+                                        preprocess_leaf_data,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_trial_gfs,
-                                                           type_range,
-                                                           )
+                                                          type_range,
+                                                          )
 from dune.codegen.pdelab.driver.gridoperator import (name_gridoperator,
-                                                      type_gridoperator,
-                                                      name_localoperator,
-                                                      )
-from dune.codegen.pdelab.driver.constraints import (has_dirichlet_constraints,
-                                                     name_bctype_function,
-                                                     name_constraintscontainer,
+                                                     type_gridoperator,
+                                                     name_localoperator,
                                                      )
+from dune.codegen.pdelab.driver.constraints import (has_dirichlet_constraints,
+                                                    name_bctype_function,
+                                                    name_constraintscontainer,
+                                                    )
 from dune.codegen.pdelab.driver.interpolate import (interpolate_dirichlet_data,
-                                                     name_boundary_function,
-                                                     )
+                                                    name_boundary_function,
+                                                    )
 from dune.codegen.pdelab.driver.solve import (print_matrix,
-                                               print_residual,
-                                               name_linearsolver,
-                                               name_stationarynonlinearproblemsolver,
-                                               name_vector,
-                                               type_linearsolver,
-                                               type_stationarynonlinearproblemssolver,
-                                               type_vector,
-                                               )
+                                              print_residual,
+                                              name_linearsolver,
+                                              name_stationarynonlinearproblemsolver,
+                                              name_vector,
+                                              type_linearsolver,
+                                              type_stationarynonlinearproblemssolver,
+                                              type_vector,
+                                              )
 from dune.codegen.pdelab.driver.vtk import (name_vtk_sequence_writer,
-                                             visualize_initial_condition,
-                                             name_predicate)
+                                            visualize_initial_condition,
+                                            name_predicate)
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 
 
 def solve_instationary():
diff --git a/python/dune/codegen/pdelab/driver/interpolate.py b/python/dune/codegen/pdelab/driver/interpolate.py
index 4d88cb3784c387efaab79b0d88d6d21601ad711d..7877497e3f69119f558ddf9b3e37659ec84043ac 100644
--- a/python/dune/codegen/pdelab/driver/interpolate.py
+++ b/python/dune/codegen/pdelab/driver/interpolate.py
@@ -1,18 +1,18 @@
 from dune.codegen.generation import (cached,
-                                      get_counted_variable,
-                                      global_context,
-                                      include_file,
-                                      preamble,
-                                      )
+                                     get_counted_variable,
+                                     global_context,
+                                     include_file,
+                                     preamble,
+                                     )
 from dune.codegen.pdelab.driver import (FEM_name_mangling,
-                                         get_form_ident,
-                                         get_trial_element,
-                                         is_stationary,
-                                         preprocess_leaf_data,
-                                         )
+                                        get_form_ident,
+                                        get_trial_element,
+                                        is_stationary,
+                                        preprocess_leaf_data,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_trial_gfs,
-                                                           name_leafview,
-                                                           )
+                                                          name_leafview,
+                                                          )
 from ufl import FiniteElement, MixedElement, TensorElement, VectorElement, TensorProductElement
 
 
diff --git a/python/dune/codegen/pdelab/driver/solve.py b/python/dune/codegen/pdelab/driver/solve.py
index 5a95af3f9d3cb15a1d14a851bec8f4a8184be713..79dfac051c66c2faa50c4e262eb419ed30b5fde1 100644
--- a/python/dune/codegen/pdelab/driver/solve.py
+++ b/python/dune/codegen/pdelab/driver/solve.py
@@ -1,24 +1,24 @@
 from dune.codegen.generation import (include_file,
-                                      preamble,
-                                      )
+                                     preamble,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 from dune.codegen.pdelab.driver import (get_form_ident,
-                                         is_linear,
-                                         name_initree,
-                                         )
+                                        is_linear,
+                                        name_initree,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_trial_gfs,
-                                                           name_leafview,
-                                                           type_domainfield,
-                                                           type_trial_gfs,
-                                                           )
+                                                          name_leafview,
+                                                          type_domainfield,
+                                                          type_trial_gfs,
+                                                          )
 from dune.codegen.pdelab.driver.constraints import (type_constraintscontainer,
-                                                     name_assembled_constraints,
-                                                     )
+                                                    name_assembled_constraints,
+                                                    )
 from dune.codegen.pdelab.driver.gridoperator import (name_gridoperator,
-                                                      type_gridoperator,
-                                                      )
+                                                     type_gridoperator,
+                                                     )
 from dune.codegen.pdelab.driver.interpolate import interpolate_dirichlet_data
 from dune.codegen.pdelab.geometry import world_dimension
 
diff --git a/python/dune/codegen/pdelab/driver/timings.py b/python/dune/codegen/pdelab/driver/timings.py
index d19083d0b7cae9c03ca71f5b25f43f7b03825f2d..714f263a353c5a8a3a6b3b83dbc651ffd3401961 100644
--- a/python/dune/codegen/pdelab/driver/timings.py
+++ b/python/dune/codegen/pdelab/driver/timings.py
@@ -2,27 +2,27 @@
 
 from dune.codegen.options import get_option
 from dune.codegen.generation import (cached,
-                                      include_file,
-                                      pre_include,
-                                      post_include,
-                                      preamble,
-                                      )
+                                     include_file,
+                                     pre_include,
+                                     post_include,
+                                     preamble,
+                                     )
 from dune.codegen.pdelab.driver import (get_form_ident,
-                                         is_linear,
-                                         name_initree,
-                                         name_mpihelper,
-                                         )
+                                        is_linear,
+                                        name_initree,
+                                        name_mpihelper,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_leafview,
-                                                           name_trial_gfs,
-                                                           type_leafview,
-                                                           )
+                                                          name_trial_gfs,
+                                                          type_leafview,
+                                                          )
 from dune.codegen.pdelab.driver.gridoperator import (name_gridoperator,
-                                                      name_localoperator,
-                                                      type_gridoperator,
-                                                      )
+                                                     name_localoperator,
+                                                     type_gridoperator,
+                                                     )
 from dune.codegen.pdelab.driver.solve import (name_vector,
-                                               type_vector,
-                                               )
+                                              type_vector,
+                                              )
 
 
 @preamble(section="timings")
diff --git a/python/dune/codegen/pdelab/driver/vtk.py b/python/dune/codegen/pdelab/driver/vtk.py
index f58186baa3a18d5279a4f9bc31b543c80603b6d4..dd66bea4973838be7ced00e7910fa0617456e540 100644
--- a/python/dune/codegen/pdelab/driver/vtk.py
+++ b/python/dune/codegen/pdelab/driver/vtk.py
@@ -1,17 +1,17 @@
 from dune.codegen.generation import (include_file,
-                                      preamble,
-                                      )
+                                     preamble,
+                                     )
 from dune.codegen.options import get_form_option
 from dune.codegen.pdelab.driver import (get_form_ident,
-                                         get_trial_element,
-                                         name_initree,
-                                         preprocess_leaf_data,
-                                         )
+                                        get_trial_element,
+                                        name_initree,
+                                        preprocess_leaf_data,
+                                        )
 from dune.codegen.pdelab.driver.gridfunctionspace import (name_leafview,
-                                                           name_gfs,
-                                                           name_trial_gfs,
-                                                           type_leafview,
-                                                           )
+                                                          name_gfs,
+                                                          name_trial_gfs,
+                                                          type_leafview,
+                                                          )
 from dune.codegen.pdelab.driver.solve import name_vector
 
 
diff --git a/python/dune/codegen/pdelab/function.py b/python/dune/codegen/pdelab/function.py
index 2ca4f400539174022a4ae9ab89f7ca2dcab98fe1..74e6b6b6ad08cdf8b6b9c1f0a1c5aeeae5f3f3c9 100644
--- a/python/dune/codegen/pdelab/function.py
+++ b/python/dune/codegen/pdelab/function.py
@@ -1,12 +1,12 @@
 from dune.codegen.generation import (get_backend,
-                                      instruction,
-                                      kernel_cached,
-                                      preamble,
-                                      temporary_variable,
-                                      )
+                                     instruction,
+                                     kernel_cached,
+                                     preamble,
+                                     temporary_variable,
+                                     )
 from dune.codegen.pdelab.geometry import (name_cell,
-                                           world_dimension,
-                                           )
+                                          world_dimension,
+                                          )
 from dune.codegen.pdelab.localoperator import name_gridfunction_member
 
 import pymbolic.primitives as prim
diff --git a/python/dune/codegen/pdelab/geometry.py b/python/dune/codegen/pdelab/geometry.py
index ef87ac4c2120e0f9a3932213973a3b4d57118089..7d1e722ad8d92143d44747cbc2622b7eec0431b2 100644
--- a/python/dune/codegen/pdelab/geometry.py
+++ b/python/dune/codegen/pdelab/geometry.py
@@ -1,21 +1,21 @@
 from dune.codegen.ufl.modified_terminals import Restriction
 from dune.codegen.pdelab.restriction import restricted_name
 from dune.codegen.generation import (backend,
-                                      class_member,
-                                      domain,
-                                      get_backend,
-                                      get_global_context_value,
-                                      globalarg,
-                                      iname,
-                                      include_file,
-                                      kernel_cached,
-                                      preamble,
-                                      temporary_variable,
-                                      valuearg,
-                                      )
+                                     class_member,
+                                     domain,
+                                     get_backend,
+                                     get_global_context_value,
+                                     globalarg,
+                                     iname,
+                                     include_file,
+                                     kernel_cached,
+                                     preamble,
+                                     temporary_variable,
+                                     valuearg,
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   option_switch,
-                                   )
+                                  option_switch,
+                                  )
 from dune.codegen.loopy.target import dtype_floatingpoint, type_floatingpoint
 from dune.codegen.pdelab.quadrature import quadrature_preamble
 from dune.codegen.tools import get_pymbolic_basename
diff --git a/python/dune/codegen/pdelab/localoperator.py b/python/dune/codegen/pdelab/localoperator.py
index 201590631035f374f5c965948b3d8031d2994b26..c598232f2ac4a9f1069740551c699365de62a5a9 100644
--- a/python/dune/codegen/pdelab/localoperator.py
+++ b/python/dune/codegen/pdelab/localoperator.py
@@ -6,36 +6,36 @@ import logging
 import numpy as np
 
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   option_switch,
-                                   set_form_option)
+                                  get_option,
+                                  option_switch,
+                                  set_form_option)
 from dune.codegen.generation import (backend,
-                                      base_class,
-                                      class_basename,
-                                      class_member,
-                                      constructor_parameter,
-                                      domain,
-                                      dump_accumulate_timer,
-                                      end_of_file,
-                                      function_mangler,
-                                      generator_factory,
-                                      get_backend,
-                                      get_global_context_value,
-                                      global_context,
-                                      iname,
-                                      include_file,
-                                      initializer_list,
-                                      post_include,
-                                      retrieve_cache_functions,
-                                      retrieve_cache_items,
-                                      ReturnArg,
-                                      run_hook,
-                                      template_parameter,
-                                      )
+                                     base_class,
+                                     class_basename,
+                                     class_member,
+                                     constructor_parameter,
+                                     domain,
+                                     dump_accumulate_timer,
+                                     end_of_file,
+                                     function_mangler,
+                                     generator_factory,
+                                     get_backend,
+                                     get_global_context_value,
+                                     global_context,
+                                     iname,
+                                     include_file,
+                                     initializer_list,
+                                     post_include,
+                                     retrieve_cache_functions,
+                                     retrieve_cache_items,
+                                     ReturnArg,
+                                     run_hook,
+                                     template_parameter,
+                                     )
 from dune.codegen.cgen.clazz import (AccessModifier,
-                                      BaseClass,
-                                      ClassMember,
-                                      )
+                                     BaseClass,
+                                     ClassMember,
+                                     )
 from dune.codegen.ufl.modified_terminals import Restriction
 
 import dune.codegen.loopy.mangler
diff --git a/python/dune/codegen/pdelab/quadrature.py b/python/dune/codegen/pdelab/quadrature.py
index 9be21f47600b955ea6e1899ae7533717f2963314..8c3e2b36df63b3120883fd51737fc5ded051b157 100644
--- a/python/dune/codegen/pdelab/quadrature.py
+++ b/python/dune/codegen/pdelab/quadrature.py
@@ -1,18 +1,18 @@
 import numpy
 
 from dune.codegen.generation import (backend,
-                                      class_member,
-                                      domain,
-                                      get_backend,
-                                      get_global_context_value,
-                                      globalarg,
-                                      iname,
-                                      include_file,
-                                      instruction,
-                                      preamble,
-                                      temporary_variable,
-                                      valuearg,
-                                      )
+                                     class_member,
+                                     domain,
+                                     get_backend,
+                                     get_global_context_value,
+                                     globalarg,
+                                     iname,
+                                     include_file,
+                                     instruction,
+                                     preamble,
+                                     temporary_variable,
+                                     valuearg,
+                                     )
 from dune.codegen.pdelab.localoperator import lop_template_range_field
 from dune.codegen.options import get_form_option
 
diff --git a/python/dune/codegen/pdelab/signatures.py b/python/dune/codegen/pdelab/signatures.py
index 70ecbec7a11f81bdfa474698a13450383f91f46c..09b832ac252138181d8be19c9fd4c098b5bb9b68 100644
--- a/python/dune/codegen/pdelab/signatures.py
+++ b/python/dune/codegen/pdelab/signatures.py
@@ -2,19 +2,19 @@
 from dune.codegen.generation import get_global_context_value
 from dune.codegen.ufl.modified_terminals import Restriction
 from dune.codegen.pdelab.geometry import (name_geometry_wrapper,
-                                           type_geometry_wrapper,
-                                           )
+                                          type_geometry_wrapper,
+                                          )
 from dune.codegen.pdelab.argument import (name_accumulation_variable,
-                                           type_accumulation_variable,
-                                           name_coefficientcontainer,
-                                           type_coefficientcontainer,
-                                           name_applycontainer,
-                                           )
+                                          type_accumulation_variable,
+                                          name_coefficientcontainer,
+                                          type_coefficientcontainer,
+                                          name_applycontainer,
+                                          )
 from dune.codegen.pdelab.spaces import (name_testfunctionspace,
-                                         type_testfunctionspace,
-                                         name_trialfunctionspace,
-                                         type_trialfunctionspace,
-                                         )
+                                        type_testfunctionspace,
+                                        name_trialfunctionspace,
+                                        type_trialfunctionspace,
+                                        )
 
 
 def ufl_measure_to_pdelab_measure(which):
diff --git a/python/dune/codegen/pdelab/spaces.py b/python/dune/codegen/pdelab/spaces.py
index 2061948b51dd87fe4be03c8c7b81ec60a73d447b..d8c3c5684ce95e5a80baca6b8da11753f997607c 100644
--- a/python/dune/codegen/pdelab/spaces.py
+++ b/python/dune/codegen/pdelab/spaces.py
@@ -1,13 +1,13 @@
 """ Generator functions for PDELab local/grid function spaces etc. """
 
 from dune.codegen.generation import (class_member,
-                                      domain,
-                                      function_mangler,
-                                      generator_factory,
-                                      include_file,
-                                      preamble,
-                                      valuearg,
-                                      )
+                                     domain,
+                                     function_mangler,
+                                     generator_factory,
+                                     include_file,
+                                     preamble,
+                                     valuearg,
+                                     )
 from dune.codegen.pdelab.restriction import restricted_name
 from dune.codegen.ufl.modified_terminals import Restriction
 
diff --git a/python/dune/codegen/pdelab/tensors.py b/python/dune/codegen/pdelab/tensors.py
index ab4fe97acd4d54f234ade1a24553ec83cff9b368..754e7b24a8f639a3a73a3532ef56c888368dd2af 100644
--- a/python/dune/codegen/pdelab/tensors.py
+++ b/python/dune/codegen/pdelab/tensors.py
@@ -1,12 +1,12 @@
 """ Code generation for explicitly specified tensors """
 
 from dune.codegen.generation import (get_counted_variable,
-                                      domain,
-                                      kernel_cached,
-                                      iname,
-                                      instruction,
-                                      temporary_variable,
-                                      )
+                                     domain,
+                                     kernel_cached,
+                                     iname,
+                                     instruction,
+                                     temporary_variable,
+                                     )
 
 import pymbolic.primitives as prim
 import numpy as np
diff --git a/python/dune/codegen/sumfact/__init__.py b/python/dune/codegen/sumfact/__init__.py
index 156e59949ef80dca9112388d048a61f6b695ee02..22a6049614784ced07c1e2a68739a094ec328516 100644
--- a/python/dune/codegen/sumfact/__init__.py
+++ b/python/dune/codegen/sumfact/__init__.py
@@ -1,18 +1,18 @@
 from dune.codegen.generation import get_backend
 from dune.codegen.options import option_switch
 from dune.codegen.pdelab.argument import (name_applycontainer,
-                                           name_coefficientcontainer,
-                                           )
+                                          name_coefficientcontainer,
+                                          )
 from dune.codegen.sumfact.quadrature import (quadrature_inames,
-                                              quadrature_weight,
-                                              )
+                                             quadrature_weight,
+                                             )
 
 from dune.codegen.sumfact.basis import (lfs_inames,
-                                         pymbolic_basis,
-                                         pymbolic_reference_gradient,
-                                         pymbolic_coefficient,
-                                         pymbolic_coefficient_gradient,
-                                         )
+                                        pymbolic_basis,
+                                        pymbolic_reference_gradient,
+                                        pymbolic_coefficient,
+                                        pymbolic_coefficient_gradient,
+                                        )
 
 import dune.codegen.sumfact.accumulation
 import dune.codegen.sumfact.switch
diff --git a/python/dune/codegen/sumfact/accumulation.py b/python/dune/codegen/sumfact/accumulation.py
index ce9d7d14c0ed151691258673c1c76843bc7cfed2..5bf6703f3133bc4cdae6716480228c651e927976 100644
--- a/python/dune/codegen/sumfact/accumulation.py
+++ b/python/dune/codegen/sumfact/accumulation.py
@@ -1,27 +1,27 @@
 import itertools
 
 from dune.codegen.pdelab.argument import (name_accumulation_variable,
-                                           PDELabAccumulationFunction,
-                                           )
+                                          PDELabAccumulationFunction,
+                                          )
 from dune.codegen.generation import (backend,
-                                      domain,
-                                      dump_accumulate_timer,
-                                      generator_factory,
-                                      get_counted_variable,
-                                      get_counter,
-                                      get_global_context_value,
-                                      globalarg,
-                                      iname,
-                                      instruction,
-                                      post_include,
-                                      kernel_cached,
-                                      temporary_variable,
-                                      transform,
-                                      valuearg
-                                      )
+                                     domain,
+                                     dump_accumulate_timer,
+                                     generator_factory,
+                                     get_counted_variable,
+                                     get_counter,
+                                     get_global_context_value,
+                                     globalarg,
+                                     iname,
+                                     instruction,
+                                     post_include,
+                                     kernel_cached,
+                                     temporary_variable,
+                                     transform,
+                                     valuearg
+                                     )
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 from dune.codegen.loopy.flatten import flatten_index
 from dune.codegen.loopy.target import type_floatingpoint
 from dune.codegen.pdelab.driver import FEM_name_mangling
@@ -31,11 +31,11 @@ from dune.codegen.pdelab.signatures import assembler_routine_name
 from dune.codegen.pdelab.geometry import world_dimension
 from dune.codegen.pdelab.spaces import name_lfs
 from dune.codegen.sumfact.tabulation import (basis_functions_per_direction,
-                                              construct_basis_matrix_sequence,
-                                              )
+                                             construct_basis_matrix_sequence,
+                                             )
 from dune.codegen.sumfact.switch import (get_facedir,
-                                          get_facemod,
-                                          )
+                                         get_facemod,
+                                         )
 from dune.codegen.sumfact.symbolic import SumfactKernel, SumfactKernelInterfaceBase
 from dune.codegen.ufl.modified_terminals import extract_modified_arguments
 from dune.codegen.tools import get_pymbolic_basename, get_leaf
diff --git a/python/dune/codegen/sumfact/basis.py b/python/dune/codegen/sumfact/basis.py
index ac55347d7a0e77123bd14ef87c48b8b1349a6fe9..ce29589a1e3a8d7739519341578813fd0946603e 100644
--- a/python/dune/codegen/sumfact/basis.py
+++ b/python/dune/codegen/sumfact/basis.py
@@ -6,32 +6,32 @@ multiplication with the test function is part of the sum factorization kernel.
 import itertools
 
 from dune.codegen.generation import (backend,
-                                      domain,
-                                      get_counted_variable,
-                                      get_counter,
-                                      get_global_context_value,
-                                      globalarg,
-                                      iname,
-                                      instruction,
-                                      kernel_cached,
-                                      temporary_variable,
-                                      )
+                                     domain,
+                                     get_counted_variable,
+                                     get_counter,
+                                     get_global_context_value,
+                                     globalarg,
+                                     iname,
+                                     instruction,
+                                     kernel_cached,
+                                     temporary_variable,
+                                     )
 from dune.codegen.loopy.target import type_floatingpoint
 from dune.codegen.sumfact.tabulation import (basis_functions_per_direction,
-                                              construct_basis_matrix_sequence,
-                                              BasisTabulationMatrix,
-                                              PolynomialLookup,
-                                              name_polynomials,
-                                              polynomial_degree,
-                                              )
+                                             construct_basis_matrix_sequence,
+                                             BasisTabulationMatrix,
+                                             PolynomialLookup,
+                                             name_polynomials,
+                                             polynomial_degree,
+                                             )
 from dune.codegen.sumfact.quadrature import quadrature_inames
 from dune.codegen.sumfact.switch import (get_facedir,
-                                          get_facemod,
-                                          )
+                                         get_facemod,
+                                         )
 from dune.codegen.pdelab.argument import name_coefficientcontainer
 from dune.codegen.pdelab.geometry import (local_dimension,
-                                           world_dimension,
-                                           )
+                                          world_dimension,
+                                          )
 from dune.codegen.sumfact.symbolic import SumfactKernel, SumfactKernelInterfaceBase
 from dune.codegen.options import get_form_option
 from dune.codegen.pdelab.driver import FEM_name_mangling
diff --git a/python/dune/codegen/sumfact/geometry.py b/python/dune/codegen/sumfact/geometry.py
index c18646de6294fececcff37e24ca113c5a07917d8..3d7df5502709f064fbda325ead9212cf5e24bbb3 100644
--- a/python/dune/codegen/sumfact/geometry.py
+++ b/python/dune/codegen/sumfact/geometry.py
@@ -1,38 +1,38 @@
 """ Sum factorized geometry evaluations """
 
 from dune.codegen.generation import (backend,
-                                      class_member,
-                                      domain,
-                                      get_counted_variable,
-                                      iname,
-                                      include_file,
-                                      instruction,
-                                      kernel_cached,
-                                      preamble,
-                                      silenced_warning,
-                                      temporary_variable,
-                                      get_global_context_value,
-                                      globalarg,
-                                      valuearg,
-                                      )
+                                     class_member,
+                                     domain,
+                                     get_counted_variable,
+                                     iname,
+                                     include_file,
+                                     instruction,
+                                     kernel_cached,
+                                     preamble,
+                                     silenced_warning,
+                                     temporary_variable,
+                                     get_global_context_value,
+                                     globalarg,
+                                     valuearg,
+                                     )
 from dune.codegen.options import get_option
 from dune.codegen.pdelab.geometry import (local_dimension,
-                                           world_dimension,
-                                           name_cell_geometry,
-                                           name_geometry,
-                                           )
+                                          world_dimension,
+                                          name_cell_geometry,
+                                          name_geometry,
+                                          )
 from dune.codegen.pdelab.localoperator import (name_ansatz_gfs_constructor_param,
-                                                lop_template_ansatz_gfs,
-                                                lop_template_range_field,
-                                                )
+                                               lop_template_ansatz_gfs,
+                                               lop_template_range_field,
+                                               )
 from dune.codegen.pdelab.restriction import restricted_name
 from dune.codegen.sumfact.accumulation import basis_sf_kernels
 from dune.codegen.sumfact.basis import construct_basis_matrix_sequence
 from dune.codegen.sumfact.quadrature import (additional_inames,
-                                              default_quadrature_inames)
+                                             default_quadrature_inames)
 from dune.codegen.sumfact.realization import (name_buffer_storage,
-                                               realize_sum_factorization_kernel,
-                                               )
+                                              realize_sum_factorization_kernel,
+                                              )
 from dune.codegen.sumfact.switch import get_facedir, get_facemod
 from dune.codegen.sumfact.symbolic import SumfactKernelInterfaceBase, SumfactKernel
 from dune.codegen.sumfact.vectorization import attach_vectorization_info
diff --git a/python/dune/codegen/sumfact/quadrature.py b/python/dune/codegen/sumfact/quadrature.py
index f51c96845f4d44192646da894867b64a5c397ccb..3453d94cdeb1b52be343bad736b8a139cffe9183 100644
--- a/python/dune/codegen/sumfact/quadrature.py
+++ b/python/dune/codegen/sumfact/quadrature.py
@@ -1,25 +1,25 @@
 from dune.codegen.generation import (backend,
-                                      domain,
-                                      function_mangler,
-                                      get_global_context_value,
-                                      globalarg,
-                                      iname,
-                                      instruction,
-                                      kernel_cached,
-                                      loopy_class_member,
-                                      preamble,
-                                      temporary_variable,
-                                      )
+                                     domain,
+                                     function_mangler,
+                                     get_global_context_value,
+                                     globalarg,
+                                     iname,
+                                     instruction,
+                                     kernel_cached,
+                                     loopy_class_member,
+                                     preamble,
+                                     temporary_variable,
+                                     )
 from dune.codegen.sumfact.switch import get_facedir
 from dune.codegen.sumfact.tabulation import (quadrature_points_per_direction,
-                                              local_quadrature_points_per_direction,
-                                              name_oned_quadrature_points,
-                                              name_oned_quadrature_weights,
-                                              )
+                                             local_quadrature_points_per_direction,
+                                             name_oned_quadrature_points,
+                                             name_oned_quadrature_weights,
+                                             )
 from dune.codegen.pdelab.argument import name_accumulation_variable
 from dune.codegen.pdelab.geometry import (local_dimension,
-                                           world_dimension,
-                                           )
+                                          world_dimension,
+                                          )
 from dune.codegen.options import get_form_option
 from dune.codegen.sumfact.switch import get_facedir
 from dune.codegen.loopy.target import dtype_floatingpoint
diff --git a/python/dune/codegen/sumfact/realization.py b/python/dune/codegen/sumfact/realization.py
index 878064be21b75295e725f9d7ec1b97b70cd2dfe0..d00f2a01681ecfe14f171ef74bca08e667c67112 100644
--- a/python/dune/codegen/sumfact/realization.py
+++ b/python/dune/codegen/sumfact/realization.py
@@ -3,35 +3,35 @@ The code that triggers the creation of the necessary code constructs
 to realize a sum factorization kernel
 """
 from dune.codegen.generation import (barrier,
-                                      delete_cache_items,
-                                      dump_accumulate_timer,
-                                      generator_factory,
-                                      get_global_context_value,
-                                      globalarg,
-                                      instruction,
-                                      kernel_cached,
-                                      post_include,
-                                      preamble,
-                                      silenced_warning,
-                                      temporary_variable,
-                                      transform,
-                                      )
+                                     delete_cache_items,
+                                     dump_accumulate_timer,
+                                     generator_factory,
+                                     get_global_context_value,
+                                     globalarg,
+                                     instruction,
+                                     kernel_cached,
+                                     post_include,
+                                     preamble,
+                                     silenced_warning,
+                                     temporary_variable,
+                                     transform,
+                                     )
 from dune.codegen.loopy.flatten import flatten_index
 from dune.codegen.pdelab.argument import pymbolic_coefficient
 from dune.codegen.pdelab.basis import shape_as_pymbolic
 from dune.codegen.pdelab.geometry import world_dimension
 from dune.codegen.options import (get_form_option,
-                                   get_option,
-                                   )
+                                  get_option,
+                                  )
 from dune.codegen.pdelab.signatures import assembler_routine_name
 from dune.codegen.sumfact.permutation import (sumfact_permutation_strategy,
-                                               permute_backward,
-                                               permute_forward,
-                                               )
+                                              permute_backward,
+                                              permute_forward,
+                                              )
 from dune.codegen.sumfact.quadrature import quadrature_points_per_direction
 from dune.codegen.sumfact.symbolic import (SumfactKernel,
-                                            VectorizedSumfactKernel,
-                                            )
+                                           VectorizedSumfactKernel,
+                                           )
 from dune.codegen.sumfact.vectorization import attach_vectorization_info
 from dune.codegen.sumfact.accumulation import sumfact_iname
 from dune.codegen.loopy.target import dtype_floatingpoint
diff --git a/python/dune/codegen/sumfact/switch.py b/python/dune/codegen/sumfact/switch.py
index 0090e5b363501ea4798b9dd60bab1ff4d4d8fb3f..09c85af539b27c1e9eead6d95dc886f3a2824082 100644
--- a/python/dune/codegen/sumfact/switch.py
+++ b/python/dune/codegen/sumfact/switch.py
@@ -3,15 +3,15 @@
 import csv
 
 from dune.codegen.generation import (backend,
-                                      get_global_context_value,
-                                      global_context,
-                                      )
+                                     get_global_context_value,
+                                     global_context,
+                                     )
 from dune.codegen.pdelab.geometry import world_dimension
 from dune.codegen.pdelab.localoperator import generate_kernel
 from dune.codegen.pdelab.signatures import (assembly_routine_args,
-                                             assembly_routine_signature,
-                                             kernel_name,
-                                             )
+                                            assembly_routine_signature,
+                                            kernel_name,
+                                            )
 from dune.codegen.options import get_form_option, get_option
 from dune.codegen.cgen.clazz import ClassMember
 
diff --git a/python/dune/codegen/sumfact/symbolic.py b/python/dune/codegen/sumfact/symbolic.py
index b89eadcf78efaa83b5923d1da6f70d60d1985510..24f924555b0573d895ed7f574aa6d744de44f6f3 100644
--- a/python/dune/codegen/sumfact/symbolic.py
+++ b/python/dune/codegen/sumfact/symbolic.py
@@ -2,9 +2,9 @@
 
 from dune.codegen.options import get_form_option, get_option
 from dune.codegen.generation import (get_counted_variable,
-                                      subst_rule,
-                                      transform,
-                                      )
+                                     subst_rule,
+                                     transform,
+                                     )
 from dune.codegen.pdelab.geometry import local_dimension, world_dimension
 from dune.codegen.sumfact.permutation import permute_forward, sumfact_quadrature_permutation_strategy
 from dune.codegen.sumfact.quadrature import quadrature_inames
diff --git a/python/dune/codegen/sumfact/tabulation.py b/python/dune/codegen/sumfact/tabulation.py
index 404cf891d2c55fd6d56f5e885e161a9c8077c260..d5a44a8989de68f62770a7ff18165afe21d42dcd 100644
--- a/python/dune/codegen/sumfact/tabulation.py
+++ b/python/dune/codegen/sumfact/tabulation.py
@@ -3,27 +3,27 @@ from dune.codegen.ufl.modified_terminals import Restriction
 from dune.codegen.pdelab.argument import name_coefficientcontainer
 from dune.codegen.pdelab.geometry import world_dimension, local_dimension
 from dune.codegen.generation import (class_member,
-                                      domain,
-                                      function_mangler,
-                                      generator_factory,
-                                      get_global_context_value,
-                                      iname,
-                                      include_file,
-                                      initializer_list,
-                                      instruction,
-                                      loopy_class_member,
-                                      preamble,
-                                      silenced_warning,
-                                      temporary_variable,
-                                      transform,
-                                      valuearg
-                                      )
+                                     domain,
+                                     function_mangler,
+                                     generator_factory,
+                                     get_global_context_value,
+                                     iname,
+                                     include_file,
+                                     initializer_list,
+                                     instruction,
+                                     loopy_class_member,
+                                     preamble,
+                                     silenced_warning,
+                                     temporary_variable,
+                                     transform,
+                                     valuearg
+                                     )
 from dune.codegen.loopy.target import dtype_floatingpoint
 from dune.codegen.loopy.vcl import ExplicitVCLCast, get_vcl_type_size
 from dune.codegen.options import get_option
 from dune.codegen.pdelab.localoperator import (name_domain_field,
-                                                lop_template_range_field,
-                                                )
+                                               lop_template_range_field,
+                                               )
 from dune.codegen.pdelab.quadrature import quadrature_order
 from dune.codegen.tools import maybe_wrap_subscript, ceildiv
 from loopy import CallMangleInfo
diff --git a/python/dune/codegen/sumfact/vectorization.py b/python/dune/codegen/sumfact/vectorization.py
index 63886c9518dd6fe0d7657b8a92d212830f9d7033..2ac0ffb5a41eac1503a3a50b1809c971de330008 100644
--- a/python/dune/codegen/sumfact/vectorization.py
+++ b/python/dune/codegen/sumfact/vectorization.py
@@ -8,18 +8,18 @@ from dune.codegen.loopy.target import dtype_floatingpoint
 from dune.codegen.loopy.vcl import get_vcl_type_size
 from dune.codegen.loopy.symbolic import SumfactKernel, VectorizedSumfactKernel
 from dune.codegen.generation import (backend,
-                                      generator_factory,
-                                      get_backend,
-                                      get_counted_variable,
-                                      get_global_context_value,
-                                      kernel_cached,
-                                      )
+                                     generator_factory,
+                                     get_backend,
+                                     get_counted_variable,
+                                     get_global_context_value,
+                                     kernel_cached,
+                                     )
 from dune.codegen.pdelab.restriction import (Restriction,
-                                              restricted_name,
-                                              )
+                                             restricted_name,
+                                             )
 from dune.codegen.sumfact.tabulation import (quadrature_points_per_direction,
-                                              set_quadrature_points,
-                                              )
+                                             set_quadrature_points,
+                                             )
 from dune.codegen.error import CodegenVectorizationError
 from dune.codegen.options import get_form_option, get_option, set_form_option
 from dune.codegen.tools import add_to_frozendict, round_to_multiple, list_diff
diff --git a/python/dune/codegen/ufl/visitor.py b/python/dune/codegen/ufl/visitor.py
index 1e0ccb96bf872ccc0e08bdeed9f3aa9a8d5bbe65..996024cea6ec966cbb8f5463949c7bb84b2560b2 100644
--- a/python/dune/codegen/ufl/visitor.py
+++ b/python/dune/codegen/ufl/visitor.py
@@ -4,14 +4,14 @@ to pymbolic and loopy.
 """
 from dune.codegen.error import CodegenUFLError
 from dune.codegen.generation import (get_global_context_value,
-                                      domain,
-                                      globalarg,
-                                      valuearg,
-                                      )
+                                     domain,
+                                     globalarg,
+                                     valuearg,
+                                     )
 from dune.codegen.ufl.flatoperators import get_operands
 from dune.codegen.ufl.modified_terminals import (ModifiedTerminalTracker,
-                                                  Restriction,
-                                                  )
+                                                 Restriction,
+                                                 )
 from dune.codegen.tools import maybe_wrap_subscript
 from dune.codegen.options import get_form_option
 from loopy import Reduction