diff --git a/STACpopulator/extensions/cordex6.py b/STACpopulator/extensions/cordex6.py
index f6edab6..ee592e3 100644
--- a/STACpopulator/extensions/cordex6.py
+++ b/STACpopulator/extensions/cordex6.py
@@ -43,6 +43,7 @@ class CordexCmip6(DataModel):
     external_variables: str | list[str]
 
     _prefix: str = "cordex6"
+    # Note that this is not a STAC item schema, but a schema for the global attributes of the CMIP6 data.
     _schema_uri: FilePath = Path(__file__).parent / "schemas" / "cordex6" / "cmip6-cordex-global-attrs-schema.json"
 
 
@@ -69,7 +70,7 @@ def uid(self) -> str:
 
 
 
-
+# TODO: Remove before merging
 def get_test_data():
     import requests
     from siphon.catalog import TDSCatalog
diff --git a/STACpopulator/implementations/Ouranos_CMIP6-CORDEX/add_CORDEX6.py b/STACpopulator/implementations/Ouranos_CMIP6-CORDEX/add_CORDEX6.py
index 93a685e..c930a2c 100644
--- a/STACpopulator/implementations/Ouranos_CMIP6-CORDEX/add_CORDEX6.py
+++ b/STACpopulator/implementations/Ouranos_CMIP6-CORDEX/add_CORDEX6.py
@@ -19,9 +19,7 @@
 
 LOGGER = logging.getLogger(__name__)
 import argparse
-import sys
 from typing import Any
-from STACpopulator.populator_base import THREDDSRunner
 from STACpopulator.populator_base import STACpopulatorBase
 from STACpopulator.extensions.cordex6 import Cordex6DataModel
 
@@ -35,8 +33,10 @@ def create_stac_item(self, item_name: str, item_data: dict[str, Any]) -> dict[st
         return dm.stac_item()
 
 
+
+# TODO: This probably doesn't need to be copied for every implementation, right ?
 def add_parser_args(parser: argparse.ArgumentParser) -> None:
-    parser.description="CMIP6 STAC populator from a THREDDS catalog or NCML XML."
+    parser.description="CMIP6-CORDEX STAC populator from a THREDDS catalog or NCML XML."
     parser.add_argument("stac_host", help="STAC API URL")
     parser.add_argument("href", help="URL to a THREDDS catalog or a NCML XML with CMIP6 metadata.")
     parser.add_argument("--update", action="store_true", help="Update collection and its items")