diff --git a/src/agent_tlv.c b/src/agent_tlv.c
index a45236950d24a7c87b0125e0d9b9ac27f810bfaf..40979f9fee433c0fffbcb565897720f587c53c05 100644
--- a/src/agent_tlv.c
+++ b/src/agent_tlv.c
@@ -3284,26 +3284,41 @@ int agent_gen_ch_scan_response_tlv(struct agent *a, struct cmdu_buff *cmdu,
 			num_nbr = 0;
 		}
 
-		memcpy(&t->data[offset], nbr->bssid, 6);	/* bssid */
+		/* BSSID */
+		memcpy(&t->data[offset], nbr->bssid, 6);
 		offset += 6;
-		t->data[offset++] = strlen(nbr->ssid);		/* ssid len */
-		/* ssid */
+
+		/* SSID Length */
+		t->data[offset++] = strlen(nbr->ssid);
+
+		/* SSID */
 		memcpy(&t->data[offset], nbr->ssid, strlen(nbr->ssid));
 		offset += strlen(nbr->ssid);
-		t->data[offset++] = rssi_to_rcpi(nbr->rssi);	/* rcpi */
 
-		t->data[offset++] = strlen(bw_str); //+ 1;		/* BW length */
+		/* SignalStrength */
+		t->data[offset++] = rssi_to_rcpi(nbr->rssi);
+
+		/* BandwidthLength */
+		t->data[offset++] = strlen(bw_str); //+ 1;
+
+		/* ChannelBandwidth */
 		memcpy(&t->data[offset], bw_str, strlen(bw_str));
 		/* NOTE: It is not a real string terminated with EOS null */
 		offset += strlen(bw_str);
 		//t->data[offset++] = '\0';
-		t->data[offset++] = bssload_elem_pres;		/* BSS load element */
+
+		/* BSS Load Element Present */
+		/* TODO: BSS Color - bits 5-0 */
+		t->data[offset++] = bssload_elem_pres;
 
 		if (bssload_elem_pres & CH_SCAN_RESULT_BSSLOAD_PRESENT) {
-			t->data[offset++] = nbr->utilization;			/* channel utilization */
-			BUF_PUT_BE16(t->data[offset], nbr->num_stations);	/* station count */
+			/* ChannelUtilization */
+			t->data[offset++] = nbr->utilization;
+			/* StationCount */
+			BUF_PUT_BE16(t->data[offset], nbr->num_stations);
 			offset += 2;
 		}
+
 		num_nbr++;
 	}