diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/ObserverFactory.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverFactory.kt
similarity index 82%
rename from android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/ObserverFactory.kt
rename to android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverFactory.kt
index ced9554a5..b4b0bd5fa 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/ObserverFactory.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/observers/TreeObserverFactory.kt
@@ -22,10 +22,12 @@ class TreeObserverFactory {
     builders.add(builder)
   }
 
+  // TODO: Not very efficient, need to cache this. Builders cannot be removed
   fun hasObserverFor(node: Any): Boolean {
     return builders.any { it.canBuildFor(node) }
   }
 
+  // TODO: Not very efficient, need to cache this. Builders cannot be removed.
   fun createObserver(node: Any, context: Context): TreeObserver<*>? {
     return builders.find { it.canBuildFor(node) }?.build(context)
   }
@@ -33,6 +35,7 @@ class TreeObserverFactory {
   companion object {
     fun withDefaults(): TreeObserverFactory {
       val factory = TreeObserverFactory()
+      // TODO: Only builder for DecorView, maybe more are needed.
       factory.register(DecorViewTreeObserverBuilder)
 
       return factory