diff --git a/aidge_core/export_utils/export_registry.py b/aidge_core/export_utils/export_registry.py
index 6cdba285127f10e22829f32e2ee0cf3507c0e7a8..eabc6eb6b656b0c0b0c8381b665d6a6d8f3805ff 100644
--- a/aidge_core/export_utils/export_registry.py
+++ b/aidge_core/export_utils/export_registry.py
@@ -1,12 +1,6 @@
-from typing import Dict, List, Set, Type
+from typing import Dict, List
 import aidge_core
 from aidge_core.export_utils import ExportNode
-from abc import ABC
-from enum import Enum
-
-# Language
-LANGUAGE = Enum('LANGUAGE', ['Cpp/C'])
-
 
 class classproperty:
     """Helper class to define class properties,
@@ -35,7 +29,7 @@ class ExportLib(aidge_core.OperatorImpl):
     # Value: Path where to copy the file relative to the export root
     static_files: Dict[str, str] = {}
     # PRIVATE
-    # Registry of exportNode, class level dictionary, shared accross all ExportLib
+    # Registry of exportNode, class level dictionary, shared across all ExportLib
     _cls_export_node_registry = {}
 
     def __init__(self, operator):
diff --git a/aidge_core/export_utils/templates/forward.jinja b/aidge_core/export_utils/templates/forward.jinja
index a58bd168a9a0d5611c988cafb3c13b410e47a27a..aec5867b132e0ece9a8a39d9cf5daadeb25ea24a 100644
--- a/aidge_core/export_utils/templates/forward.jinja
+++ b/aidge_core/export_utils/templates/forward.jinja
@@ -19,12 +19,12 @@ static {{mem_ctype}} mem[{{peak_mem}}];
 {# Forward function #}
 {#- Support multiple inputs with different datatypes and multiple outputs with different datatypes -#}
 void {{ func_name }} (
-    {%- for i in range(inputs_name | length) %}
+    {%- for i in range(inputs_name | length) -%}
     const {{ inputs_dtype[i] }}* {{ inputs_name[i] }},
-    {% endfor -%}
-    {%- for o in range(outputs_name | length) %}
+    {%- endfor -%}
+    {%- for o in range(outputs_name | length) -%}
     {{ outputs_dtype[o] }}** {{ outputs_name[o] }}_ptr{% if not loop.last %}, {% endif %}
-    {% endfor -%})
+    {%- endfor -%})
 {
 
     {%- for action in actions %}
diff --git a/aidge_core/export_utils/templates/forward_header.jinja b/aidge_core/export_utils/templates/forward_header.jinja
index 8530d91e995fc3c4e25b0e148f4cf1f4ded9ea0b..574f5323866786f3b6d6f98af53b8ccf3d9975b3 100644
--- a/aidge_core/export_utils/templates/forward_header.jinja
+++ b/aidge_core/export_utils/templates/forward_header.jinja
@@ -11,12 +11,12 @@ extern "C" {
 {%- endfor %}
 
 void {{ func_name }} (
-    {%- for i in range(inputs_name | length) %}
+    {%- for i in range(inputs_name | length) -%}
     const {{ inputs_dtype[i] }}* {{ inputs_name[i] }},
-    {% endfor -%}
+    {%- endfor -%}
     {%- for o in range(outputs_name | length) %}
     {{ outputs_dtype[o] }}** {{ outputs_name[o] }}{% if not loop.last %}, {% endif %}
-    {% endfor -%});
+    {%- endfor -%});
 
 #ifdef __cplusplus
 }