diff --git a/src/covid19/blueprints/rki/rki_model.py b/src/covid19/blueprints/rki/rki_model.py
index 4dc19d5e851f386cca27cfda346acbb922d89c46..71f04ba072588613b7102f815330314670ff8567 100644
--- a/src/covid19/blueprints/rki/rki_model.py
+++ b/src/covid19/blueprints/rki/rki_model.py
@@ -100,7 +100,7 @@ class RkiCountry(db.Model):
         ).order_by(cls.country).paginate(page, per_page=ITEMS_PER_PAGE)
 
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: #123 split RkiService into two Services, one for bundeslaender and one for landkreise
 # TODO: RkiGermanyData rename to RkiBundeslaender
 class RkiGermanyData(db.Model):
     __tablename__ = 'rki_bundeslsaender'
@@ -171,7 +171,7 @@ class RkiGermanyData(db.Model):
             ).paginate(page, per_page=ITEMS_PER_PAGE)
 
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 # TODO: RkiLandkreise
 class RkiLandkreise(db.Model):
     __tablename__ = 'rki_landkreise'
diff --git a/src/covid19/blueprints/rki/rki_model_import.py b/src/covid19/blueprints/rki/rki_model_import.py
index 313e9bfbc173e2670b373d624e2eb225b1997937..75798e24c153706734aa537ddced398b8777199a 100644
--- a/src/covid19/blueprints/rki/rki_model_import.py
+++ b/src/covid19/blueprints/rki/rki_model_import.py
@@ -3,7 +3,7 @@ from database import db, ITEMS_PER_PAGE
 # OBJECTID_1,LAN_ew_AGS,LAN_ew_GEN,LAN_ew_BEZ,LAN_ew_EWZ,OBJECTID,Fallzahl,Aktualisierung,AGS_TXT,GlobalID,faelle_100000_EW,Death,cases7_bl_per_100k,cases7_bl,death7_bl,cases7_bl_per_100k_txt,AdmUnitId,SHAPE_Length,SHAPE_Area
 
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 # TODO: RkiBundeslaenderImport
 class RkiBundeslaenderImport(db.Model):
     __tablename__ = 'rki_bundeslsaender_import'
@@ -55,7 +55,7 @@ class RkiBundeslaenderImport(db.Model):
         return self
 
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 # TODO: add fields from csv to RkiLandkreiseImport
 class RkiLandkreiseImport(db.Model):
     __tablename__ = 'rki_landkreise_import'
diff --git a/src/covid19/blueprints/rki/rki_service_download.py b/src/covid19/blueprints/rki/rki_service_download.py
index 510eaf21c81b7227481fa36bb7516e2d9be41c22..c87040d84cb5e8030bba0884e0ae987fbd3a405f 100644
--- a/src/covid19/blueprints/rki/rki_service_download.py
+++ b/src/covid19/blueprints/rki/rki_service_download.py
@@ -5,7 +5,7 @@ from flask import flash
 
 from database import app
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 # TODO: refactor RkiServiceDownload to new method scheme introduced 07.02.2021
 class RkiServiceDownload:
     def __init__(self, database):
@@ -25,7 +25,7 @@ class RkiServiceDownload:
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" RKI Service Download [ready]")
 
-    # TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+    # TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
     def __download_file(self, datascope, cvsfile_name, url_src):
         src_cvsfile_path = ".." + os.sep + ".." + os.sep + "data" + os.sep + cvsfile_name
         app.logger.info(" download - RKI "+datascope+" [begin] ")
@@ -59,7 +59,7 @@ class RkiServiceDownload:
             flash(msg)
         return self
 
-    # TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+    # TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
     def download_file(self):
         app.logger.info(" download - RKI [begin] ")
         app.logger.info("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki/rki_service_import.py b/src/covid19/blueprints/rki/rki_service_import.py
index 8dbf0caee27ce22cdd93666be4919afdaedf9c86..5e62dc4cf77b2613d7f628b8f59d6563c22d2db9 100644
--- a/src/covid19/blueprints/rki/rki_service_import.py
+++ b/src/covid19/blueprints/rki/rki_service_import.py
@@ -8,7 +8,7 @@ from database import db, app
 # TODO: move WhoGlobalDataImportTable to RKI
 from covid19.blueprints.who.who_model_import import WhoGlobalDataImportTable
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 class RkiServiceImport:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")
@@ -23,7 +23,7 @@ class RkiServiceImport:
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" RKI Service Import [ready]")
 
-    # TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+    # TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
     def import_file(self):
         app.logger.info(" import RKI [begin]")
         app.logger.info("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki/rki_service_update.py b/src/covid19/blueprints/rki/rki_service_update.py
index 54cd78a3aff23f149f4db462192be1763551c17f..2c6a2b273d6af65b65e18f97c553c7fbf55a12a1 100644
--- a/src/covid19/blueprints/rki/rki_service_update.py
+++ b/src/covid19/blueprints/rki/rki_service_update.py
@@ -6,7 +6,7 @@ from covid19.blueprints.rki.rki_model_import import RkiGermanyDataImportTable
 
 rki_service_update = None
 
-# TODO: question: Split RkiService into two Services, one for bundeslaender and one for landkreise?
+# TODO: Split RkiService into two Services, one for bundeslaender and one for landkreise?
 class RkiServiceUpdate:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")