diff --git a/core/src/main/scala/com/nvidia/spark/rapids/tool/planparser/DatabricksParseHelper.scala b/core/src/main/scala/com/nvidia/spark/rapids/tool/planparser/DatabricksParseHelper.scala
index 506c885fb..81004543c 100644
--- a/core/src/main/scala/com/nvidia/spark/rapids/tool/planparser/DatabricksParseHelper.scala
+++ b/core/src/main/scala/com/nvidia/spark/rapids/tool/planparser/DatabricksParseHelper.scala
@@ -129,7 +129,9 @@ object DatabricksParseHelper extends Logging {
     // Implicitly define JSON formats for deserialization using DefaultFormats
     implicit val formats: Formats = DefaultFormats
     // Extract and deserialize the JValue object into a Map[String, String]
-    // TODO: Instead of only extracting the first value, we should consider extracting all values
+    // TODO: Currently, only the first mapping in the list is used.
+    //       This limitation exists because we cannot differentiate between
+    //       these operators in the SparkPlan.
     json.extract[Map[String, List[String]]].mapValues(_.head)
   }
 
diff --git a/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/GenerateDot.scala b/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/GenerateDot.scala
index ae3572404..850290464 100644
--- a/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/GenerateDot.scala
+++ b/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/GenerateDot.scala
@@ -46,7 +46,6 @@ import org.apache.spark.sql.rapids.tool.profiling.{ApplicationInfo, SparkPlanInf
 object GenerateDot {
   val GPU_COLOR = "#76b900" // NVIDIA Green
   val CPU_COLOR = "#0071c5"
-  // TODO: Add color for Photon nodes
   val TRANSITION_COLOR = "red"
 
   def formatMetric(m: SQLMetricInfo, value: Long): String = {