diff --git a/src/covid19/blueprints/application/application_service_config.py b/src/covid19/blueprints/application/application_service_config.py
index ae3fd5f344d1cbc93df2db4c88b350b89652b078..d4d920ced4e45348875e02e41f684edec716c569 100644
--- a/src/covid19/blueprints/application/application_service_config.py
+++ b/src/covid19/blueprints/application/application_service_config.py
@@ -9,7 +9,7 @@ from covid19.blueprints.rki_landkreise.rki_landkreise_model_import import RkiLan
 
 
 class ApplicationServiceConfig:
-    def __init__(self, slug, category, sub_category, tablename, cvsfile_name, url_src):
+    def __init__(self, slug: str, category: str, sub_category: str, tablename: str, cvsfile_name: str, url_src: str):
         self.limit_nr = 20
         self.data_path = ".." + os.sep + ".." + os.sep + "data"
         self.slug = slug,
@@ -28,7 +28,7 @@ class ApplicationServiceConfig:
         return ApplicationServiceConfig(
             slug='who',
             category='WHO',
-            sub_castegory='Cases and Deaths',
+            sub_category='Cases and Deaths',
             tablename=WhoImport.__tablename__,
             cvsfile_name="WHO-COVID-19-global-data.csv",
             url_src="https://covid19.who.int/WHO-COVID-19-global-data.csv",
diff --git a/src/covid19/blueprints/application/application_service_download.py b/src/covid19/blueprints/application/application_service_download.py
index 862c79143ae7f3f0e84c0fa8141e5d33a4f6fcd8..f182ebe87bcffeab3290fdf1dc3035787f9561fd 100644
--- a/src/covid19/blueprints/application/application_service_download.py
+++ b/src/covid19/blueprints/application/application_service_download.py
@@ -9,12 +9,12 @@ from covid19.blueprints.application.application_service_config import Applicatio
 class ApplicationServiceDownload:
     def __init__(self, database, config: ApplicationServiceConfig):
         app.logger.debug("------------------------------------------------------------")
-        app.logger.debug(" "+self.cfg.slug+" Download Service [init]")
+        app.logger.debug(" ApplicationServiceDownload [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
         self.cfg = config
         app.logger.debug("------------------------------------------------------------")
-        app.logger.debug(" "+self.cfg.slug+" Download Service [ready]")
+        app.logger.debug(" ApplicationServiceDownload [ready]")
 
     def __log_error(self, error_msg: str):
         flash_msg = self.cfg.msg_error + error_msg
@@ -24,7 +24,7 @@ class ApplicationServiceDownload:
         app.logger.error(self.cfg.slug+"############################################################")
         return self
 
-    def __log_success(self, data_file):
+    def __log_success(self, data_file: str):
         app.logger.info(self.cfg.slug+" download success: " + data_file + " ")
         app.logger.info(self.cfg.slug+self.cfg.msg_ok)
         flash(self.cfg.msg_ok)
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index 615cdaee49bc8b2347b1fef8d6e00d6a8f7f5140..5b213f2c94374b86116c35718823b400b0b60b1f 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -4,11 +4,11 @@ import psycopg2
 
 from database import db, app
 from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 
 
 class RkiVaccinationServiceImport:
-    def __init__(self, database, config: RkiVaccinationServiceConfig):
+    def __init__(self, database, config: ApplicationServiceConfig):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service Import [init]")
         app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 67319e1bbdb0019ea67d5ae42a6cd9e565fd9576..1280a5054197cb907c5106b7bf517c75a0eb70a0 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,12 +1,12 @@
 from database import db, app
 
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
 from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported, RkiVaccinationData
 
 
 class RkiVaccinationServiceUpdate:
-    def __init__(self, database, config: RkiVaccinationServiceConfig):
+    def __init__(self, database, config: ApplicationServiceConfig):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Europe Service Update [init]")
         app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index b6e965ae815e1f0297e19fcd9abf6da686f48542..124e4e5d591c0b0387a74aa0b333229269b6fdd3 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -3,11 +3,11 @@ import csv
 import psycopg2
 from database import db, app
 from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.who.who_service_download import WhoServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 
 
 class WhoServiceImport:
-    def __init__(self, database, config: WhoServiceConfig):
+    def __init__(self, database, config: ApplicationServiceConfig):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" WHO Service Import [init]")
         app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 6e5d80e41fd2b65bd0618aeb93ab38dcfea4583a..4f41f7321da87a3b466cafb0b731be813b4a4e95 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -1,11 +1,11 @@
 from database import db, app
 from covid19.blueprints.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoData
 from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.who.who_service_download import WhoServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 
 
 class WhoServiceUpdate:
-    def __init__(self, database, config: WhoServiceConfig):
+    def __init__(self, database, config: ApplicationServiceConfig):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" WhoServiceUpdate [init]")
         app.logger.debug("------------------------------------------------------------")