diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 842deff..1605ca1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ flake8:
   stage: lint&test
   script:
   - pip install -r dev_requirements.txt
-  - flake8 --max-line-length=120 --count --select=E9,F63,F7,F82 --show-source --statistics src/main/python/ddadevops/*.py
+  - flake8 --max-line-length=120 --count --select=E9,F63,F7,F82 --show-source --statistics src/main/python/ddadevops/*.py # TODO: change target
   - flake8 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics src/main/python/ddadevops/*.py
 
 mypy:
@@ -27,7 +27,7 @@ pylint:
   stage: lint&test
   script:
   - pip install -r dev_requirements.txt
-  - pylint -d C0301,W0614,C0114,C0115,C0116,similarities,W0702,W0702,R0913,R0902,R0914,R1732 src/
+  - pylint -d C0301,W0614,C0114,C0115,C0116,similarities,W0702,W0702,R0913,R0902,R0914,R1732 src/ # TODO: narrower focus on target
 
 pytest:
   stage: lint&test
diff --git a/src/main/python/ddadevops/application/release_mixin_services.py b/src/main/python/ddadevops/application/release_mixin_services.py
index 1a3c0cb..3a4dbe2 100644
--- a/src/main/python/ddadevops/application/release_mixin_services.py
+++ b/src/main/python/ddadevops/application/release_mixin_services.py
@@ -6,7 +6,7 @@ class PrepareReleaseService():
 
     def __init__(self, release_repo: ReleaseRepository):
         self.release_repo = release_repo
-        self.release = release_repo.get_release()
+        self.release = release_repo.get_release() # TODO: make stateless: argument to receiving func
         self.git_api = GitApi()
 
     def __write_and_commit_version(self, version: Version, commit_message: str):
@@ -26,8 +26,8 @@ class TagAndPushReleaseService():
 
     def __init__(self, git_api: GitApi, release_repo: ReleaseRepository):
         self.git_api = git_api
-        self.release_repo = release_repo
-        self.release = release_repo.get_release()
+        self.release_repo = release_repo 
+        self.release = release_repo.get_release() # TODO: make stateless: argument to receiving func
 
     def tag_release(self):
         annotation = 'v' + self.release.version.get_version_string()
diff --git a/src/main/python/ddadevops/domain/release.py b/src/main/python/ddadevops/domain/release.py
index 7f9baf0..a2b1e0c 100644
--- a/src/main/python/ddadevops/domain/release.py
+++ b/src/main/python/ddadevops/domain/release.py
@@ -97,4 +97,4 @@ class Release():
         return result
 
     def is_valid(self, main_branch):
-        return len(self.validate(main_branch)) < 1
+        return len(self.validate(main_branch)) < 1 # TODO: Use abstract is_valid in Validatable
diff --git a/src/main/python/ddadevops/release_mixin.py b/src/main/python/ddadevops/release_mixin.py
index 590958c..373283a 100644
--- a/src/main/python/ddadevops/release_mixin.py
+++ b/src/main/python/ddadevops/release_mixin.py
@@ -5,6 +5,7 @@ from src.main.python.ddadevops.infrastructure.release_mixin import ReleaseReposi
 from src.main.python.ddadevops.application import PrepareReleaseService, TagAndPushReleaseService
 from src.main.python.ddadevops.domain import ReleaseConfig, EnvironmentKeys
 
+# TODO: remove the config creation
 def create_release_mixin_config(config_file, main_branch) -> dict:
     config = {}
     config.update(
@@ -12,13 +13,14 @@ def create_release_mixin_config(config_file, main_branch) -> dict:
             {'main_branch': main_branch,
              'config_file': config_file}})
     return config
-
+# TODO: remove the config creation
 def add_versions(config, release_version, bump_version) -> dict:
     config['ReleaseMixin'].update(
         {'release_version': release_version,
          'bump_version': bump_version})
     return config
 
+# TODO: remove the config argument
 class ReleaseMixin(DevopsBuild):
     def __init__(self, project: Project, config: Optional[dict] = None, release_config: Optional[ReleaseConfig] = None):
         if not release_config: