diff --git a/src/pystencilssfg/composer/basic_composer.py b/src/pystencilssfg/composer/basic_composer.py
index a4cef40cff629a2d819ba9f3febfe70460b04d8c..e002dd0db857aba805270dfb4418cc131bf0eb2e 100644
--- a/src/pystencilssfg/composer/basic_composer.py
+++ b/src/pystencilssfg/composer/basic_composer.py
@@ -194,8 +194,10 @@ class SfgBasicComposer(SfgIComposer):
         return SfgRequireIncludes(
             list(SfgHeaderInclude.parse(incl) for incl in includes)
         )
-    
-    def cpptype(self, typename: str, ptr: bool = False, ref: bool = False, const: bool = False):
+
+    def cpptype(
+        self, typename: str, ptr: bool = False, ref: bool = False, const: bool = False
+    ):
         if ptr and ref:
             raise SfgException("Create either a pointer, or a ref type, not both!")
 
diff --git a/src/pystencilssfg/configuration.py b/src/pystencilssfg/configuration.py
index e9a2385894dc1def834a41c604495dce83d5c92f..2eb3efe7855af24cfe21e2815d7a40d6eea60686 100644
--- a/src/pystencilssfg/configuration.py
+++ b/src/pystencilssfg/configuration.py
@@ -249,7 +249,7 @@ def add_config_args_to_parser(parser: ArgumentParser):
     config_group.add_argument(
         "--sfg-output-mode",
         type=str,
-        default="standalone",
+        default=None,
         choices=("standalone", "inline", "header-only"),
         dest="output_mode",
     )
@@ -266,15 +266,18 @@ def config_from_parser_args(args):
     else:
         project_config = None
 
-    match args.output_mode.lower():
-        case "standalone":
-            output_mode = SfgOutputMode.STANDALONE
-        case "inline":
-            output_mode = SfgOutputMode.INLINE
-        case "header-only":
-            output_mode = SfgOutputMode.HEADER_ONLY
-        case _:
-            assert False, "invalid output mode"
+    if args.output_mode is not None:
+        match args.output_mode.lower():
+            case "standalone":
+                output_mode = SfgOutputMode.STANDALONE
+            case "inline":
+                output_mode = SfgOutputMode.INLINE
+            case "header-only":
+                output_mode = SfgOutputMode.HEADER_ONLY
+            case _:
+                assert False, "invalid output mode"
+    else:
+        output_mode = None
 
     if args.file_extensions is not None:
         file_extentions = list(args.file_extensions.split(","))
diff --git a/src/pystencilssfg/generator.py b/src/pystencilssfg/generator.py
index 91ef2526fa0f68822ee8a17b067d073c4e08802f..22db7e2cc54d0670bd4a378dae88c95559d04e18 100644
--- a/src/pystencilssfg/generator.py
+++ b/src/pystencilssfg/generator.py
@@ -26,11 +26,11 @@ class SourceFileGenerator:
     defined by the configuration.
     Existing copies of the target files are deleted on entry to the managed region,
     and if an exception occurs within the managed region, no files are exported.
-    
+
     **Configuration:** The `SourceFileGenerator` optionally takes a user-defined configuration
     object which is merged with configuration obtained from the build system; for details
     on configuration sources, refer to :class:`SfgConfiguration`.
-    
+
     Args:
         sfg_config: User configuration for the code generator
     """