diff --git a/pkg/readiness/ready_tracker.go b/pkg/readiness/ready_tracker.go
index ad329843e40..36a1ce7958c 100644
--- a/pkg/readiness/ready_tracker.go
+++ b/pkg/readiness/ready_tracker.go
@@ -45,7 +45,7 @@ import (
 
 var log = logf.Log.WithName("readiness-tracker")
 
-// Commenting out the flag and replacing with a false boolean constant because the value of the flag is currently moot without a retry limit
+// TODO: Uncomment the flag and deleted the boolean constant when we support retry limits (currently the value of the flag is moot without a retry limit since failure won't happen due to unlimited retries)
 // var crashOnFailureFetchingExpectations = flag.Bool("crash-on-failure-fetching-expectations", false, "Unless set (defaults to false), gatekeeper will ignore errors when gathering expectations. This prevents bootstrapping errors from crashing Gatekeeper at the cost of increasing the risk Gatekeeper will under-enforce policy. Enabling this will help prevent under-enforcement at the risk of crashing during startup. Note that enabling this flag currently does not achieve the aforementioned effect since fetching expectations will retry until success.")
 const crashOnFailureFetchingExpectations = false
 
@@ -91,7 +91,7 @@ type Tracker struct {
 
 // NewTracker creates a new Tracker and initializes the internal trackers.
 func NewTracker(lister Lister, mutationEnabled, externalDataEnabled, expansionEnabled bool) *Tracker {
-	// Dereference crashOnFailureFetchingExpectations when we change crashOnFailureFetchingExpectations back to a flag
+	// TODO: Dereference crashOnFailureFetchingExpectations when we change crashOnFailureFetchingExpectations to a flag
 	return newTracker(lister, mutationEnabled, externalDataEnabled, expansionEnabled, crashOnFailureFetchingExpectations, nil, nil)
 }