diff --git a/netutils/cjson/Kconfig b/netutils/cjson/Kconfig
index d50a0d544..c18531346 100644
--- a/netutils/cjson/Kconfig
+++ b/netutils/cjson/Kconfig
@@ -31,13 +31,13 @@ config CJSON_UNITY_TEST_DIR
 	default "/data"
 
 config CJSON_TEST_PRIORITY
-        int "task priority"
-        default 100
+	int "task priority"
+	default 100
 
 config CJSON_TEST_STACKSIZE
-        int "stack size"
-        default 102400
+	int "stack size"
+	default 102400
 
-endif
+endif # NETUTILS_CJSON_TEST
 
-endif
+endif # NETUTILS_CJSON
diff --git a/testing/superpi/Kconfig b/testing/superpi/Kconfig
index 56c848eb1..411d0d65c 100644
--- a/testing/superpi/Kconfig
+++ b/testing/superpi/Kconfig
@@ -1,21 +1,21 @@
 config SUPERPI
-    tristate "SuperPI test"
-    default n
+	tristate "SuperPI test"
+	default n
 
 if SUPERPI
 
 config SUPERPI_PROGNAME
-    string "Program Name"
-    default "pi_css5"
+	string "Program Name"
+	default "pi_css5"
 
 config SUPERPI_STACKSIZE
-    int "SuperPI stack size"
-    default DEFAULT_TASK_STACKSIZE
+	int "SuperPI stack size"
+	default DEFAULT_TASK_STACKSIZE
 
 config SUPERPI_PRIORITY
-    int "Task PRIORITY"
-    default 100
-    ---help---
-        The higher the priority value, the lower the priority.
+	int "Task PRIORITY"
+	default 100
+	---help---
+		The higher the priority value, the lower the priority.
 
-endif
+endif # SUPERPI
diff --git a/wireless/bluetooth/nimble/Kconfig b/wireless/bluetooth/nimble/Kconfig
index a583e3119..b8041157d 100644
--- a/wireless/bluetooth/nimble/Kconfig
+++ b/wireless/bluetooth/nimble/Kconfig
@@ -119,7 +119,7 @@ config NIMBLE_BLE_MULTI_ADV_INSTANCES
 	int "NimBLE number of multi-advertising instances"
 	default 0
 	---help---
-	  The total number of advertising instances is this number plus 1
+		The total number of advertising instances is this number plus 1
 
 config NIMBLE_BLE_PERIODIC_ADV
 	bool "NimBLE periodic advertising support"
@@ -158,7 +158,7 @@ config NIMBLE_L2CAP_COC_MAX_NUM
 	range 0 9
 	default 0
 	---help---
-	  When set to 0, BLE COC is disabled
+		When set to 0, BLE COC is disabled
 
 menu "NimBLE BLE privacy and security settings"
 
@@ -166,13 +166,13 @@ config NIMBLE_BLE_RPA_TIMEOUT
 	int "NimBLE BLE RPA timeout"
 	default 300
 	---help---
-	  The rate that new random addresses should be generated (seconds)
+		The rate that new random addresses should be generated (seconds)
 
 config NIMBLE_BLE_SM_BONDING
 	bool "NimBLE BLE bonding enable"
 	default y
 	---help---
-	  Enables bonding (persistence and restoration of secure links)
+		Enables bonding (persistence and restoration of secure links)
 
 config NIMBLE_BLE_SM_LEGACY
 	bool "NimBLE security manager legacy pairing"
diff --git a/wireless/wapi/Kconfig b/wireless/wapi/Kconfig
index eed466f3c..44396861f 100644
--- a/wireless/wapi/Kconfig
+++ b/wireless/wapi/Kconfig
@@ -9,7 +9,7 @@ menuconfig WIRELESS_WAPI
 	depends on NET && DRIVERS_WIRELESS
 	---help---
 		Wapi is a tool by Volkan YAZICI <volkan.yazici@gmail.com> that can
-		be used to manage  802.11 network.
+		be used to manage 802.11 network.
 
 if WIRELESS_WAPI
 
@@ -51,6 +51,6 @@ config WIRELESS_WAPI_CONFIG_PATH
 	string "Wireless Wapi Configure File Path"
 	default "/data/wapi.conf"
 
-endif
+endif # WIRELESS_WAPI_INITCONF
 
-endif
+endif # WIRELESS_WAPI