diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index bde27e0fe22a2d..b0c26054a00749 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -1,7 +1,6 @@
 package com.google.chip.chiptool.clusterclient.clusterinteraction
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,11 +16,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 
 /**
- * ClusterDetailFragment is the next displayed fragment after clicking on the list of available
- * endpoints. ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
+ * ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
  * the callback result.
  */
-
 class ClusterDetailFragment : Fragment(){
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index eb19dd52bed748..7bcd8cf5fc11b5 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -30,8 +30,6 @@ class ClusterInteractionFragment : Fragment() {
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
   private lateinit var clusterMap: Map<String, ClusterInfo>
-  private var devicePtr = 0L
-
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -42,8 +40,6 @@ class ClusterInteractionFragment : Fragment() {
       deviceController.setCompletionListener(ChipControllerCallback())
       getEndpointListBtn.setOnClickListener {
         scope.launch {
-          devicePtr =
-            ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
           showMessage("Retrieving endpoints")
           endpointList.visibility = View.VISIBLE
         }
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
index 8f0c335e82966c..104cc1e14e0544 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -8,12 +8,12 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.chip.chiptool.R
 
 /**
- * EndpointAdapter implements the endpointList(RecycleView) Adapter
+ * EndpointAdapter implements the endpointList(RecycleView) Adapter and associates different
+ * endpoint with the same onClick function provided in [ClusterInteractionFragment.EndpointListener]
  */
 class EndpointAdapter(
   private val endpointList: List<EndpointItem>,
   private val listener: OnItemClickListener
-
 ) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
 
   inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),