diff --git a/canutils/libdronecan/Kconfig b/canutils/libdronecan/Kconfig
index 6419d198d..11578b939 100644
--- a/canutils/libdronecan/Kconfig
+++ b/canutils/libdronecan/Kconfig
@@ -23,7 +23,7 @@ config LIBDRONECAN_VERSION
 	default "21f2a73df86886101e254d02cfc2277cd2a15717"
 	---help---
 		libcanard version.
-		
+
 config LIBDRONECAN_CANFD
 	bool "(Experimental) libcanard CAN FD Support"
 	default n
@@ -34,4 +34,4 @@ config LIBDRONECAN_CANFD
 		since libcanard doesn't support runtime switching
 		between CAN2.0B and CAN FD that well
 
-endif
+endif # CANUTILS_LIBDRONECAN
diff --git a/examples/foc/Kconfig b/examples/foc/Kconfig
index dac66003c..c2bc7e07f 100644
--- a/examples/foc/Kconfig
+++ b/examples/foc/Kconfig
@@ -564,8 +564,8 @@ config EXAMPLES_FOC_FEEDFORWARD
 	default n
 	---help---
 		This option enables feed-forward compensation for PI current controller
-		which can help achieve better performace of FOC. This option is not 
-		recomended for sensorless operations and for current controllers that 
+		which can help achieve better performace of FOC. This option is not
+		recomended for sensorless operations and for current controllers that
 		already has high update frequency.
 
 if EXAMPLES_FOC_CONTROL_PI
@@ -776,4 +776,3 @@ endif # EXAMPLES_FOC_NXSCOPE
 
 endif # EXAMPLES_FOC
 
-
diff --git a/lte/lapi/Kconfig b/lte/lapi/Kconfig
index 61af77282..76125b2b4 100644
--- a/lte/lapi/Kconfig
+++ b/lte/lapi/Kconfig
@@ -21,7 +21,7 @@ config LTE_LAPI_KEEP_COMPATIBILITY
 	default n
 	---help---
 		lte_get_operator_sync, lte_get_imsi_sync, lte_get_imei_sync, lte_get_phoneno_sync,
-		these functions have changed their specifications to specify the length of the 
+		these functions have changed their specifications to specify the length of the
 		argument string. Functions in the old spec will be discarded, but enabling this
 		option makes you be able to use them.
 		Furthermore, this option will be removed in the near future, and functions in
@@ -45,5 +45,4 @@ config LTE_LAPI_ENABLE_DEPRECATED_API
 		Deprecated APIs will be removed in the future,
 		please use the synchronous API instead.
 
-endif
-
+endif # LTE_LAPI
diff --git a/tools/Kconfig b/tools/Kconfig
index d427908a6..bb4708442 100644
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -8,13 +8,13 @@ menu "Extra Tools"
 menu "Wasm Build Options"
 
 config TOOLS_WASM_BUILD
-  bool "Enable Wasm build support"
-  default n
-  ---help---
-    If enabled, then then build system will trigger the Wasm build
-    process. This will require the WASI-SDK to be installed on the
-    host system.
+	bool "Enable Wasm build support"
+	default n
+	---help---
+		If enabled, then then build system will trigger the Wasm build
+		process. This will require the WASI-SDK to be installed on the
+		host system.
 
-endmenu
+endmenu # Wasm Build Options
 
-endmenu
+endmenu # Extra Tools