diff --git a/cfg/googletest.cfg b/cfg/googletest.cfg
index 3fab813f8..afc0dc8cf 100644
--- a/cfg/googletest.cfg
+++ b/cfg/googletest.cfg
@@ -3,4 +3,3 @@
   <define name="TEST(A,B)" value="void __ ## A ## _ ## B ( )"/>
   <define name="TEST_F(A,B)" value="void __ ## A ## _ ## B ( )"/>
 </def>
-
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 79e00d41e..08b9550f1 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -668,6 +668,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
 {
     // Deallocation and then dereferencing pointer..
     if (tok->varId() > 0) {
+        // TODO : Write a separate checker for this that uses valueFlowForward.
         const std::map<unsigned int, VarInfo::AllocInfo>::const_iterator var = varInfo->alloctype.find(tok->varId());
         if (var != varInfo->alloctype.end()) {
             bool unknown = false;
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 1926f3cf0..1996fee98 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -2035,6 +2035,7 @@ void CheckMemoryLeakInFunction::checkScope(const Token *startTok, const std::str
             tok2->deleteNext();
     }
     if ((result = Token::findmatch(tok, "[;{}] dealloc ; use_ ;")) != nullptr) {
+        // TODO : Write a separate checker for this that uses valueFlowForward.
         deallocuseError(result->tokAt(3), varname);
     }
 
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 71f38deae..3dc7157ea 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -473,6 +473,7 @@ static bool checkExceptionHandling(const Token* tok)
 
 void CheckOther::checkRedundantAssignment()
 {
+    // TODO: This function should be rewritten, it's far too complex.
     const bool printPerformance = mSettings->isEnabled(Settings::PERFORMANCE);
     const bool printStyle = mSettings->isEnabled(Settings::STYLE);
     const bool printWarning = mSettings->isEnabled(Settings::WARNING);
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index c8e107df2..2df92e26d 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -3946,6 +3946,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
         if (!calledFunctionScope)
             continue;
 
+        // TODO: Rewrite this. It does not work well to inject 1 argument at a time.
         const std::vector<const Token *> &callArguments = getArguments(tok);
         for (unsigned int argnr = 0U; argnr < callArguments.size(); ++argnr) {
             const Token *argtok = callArguments[argnr];