diff --git a/arch/arm/src/qemu/Kconfig b/arch/arm/src/qemu/Kconfig
index 64e831c254..017bfadd49 100644
--- a/arch/arm/src/qemu/Kconfig
+++ b/arch/arm/src/qemu/Kconfig
@@ -13,7 +13,7 @@ choice
 
 config ARCH_CHIP_QEMU_CORTEXA7
 	bool "Qemu virtual Processor (cortex-a7)"
-        select ARCH_CORTEXA7
+	select ARCH_CORTEXA7
 	select ARCH_HAVE_ADDRENV
 	select ARCH_HAVE_LOWVECTORS
 	select ARCH_HAVE_MULTICPU
diff --git a/arch/risc-v/src/mpfs/Kconfig b/arch/risc-v/src/mpfs/Kconfig
index dccbbec883..9392522015 100644
--- a/arch/risc-v/src/mpfs/Kconfig
+++ b/arch/risc-v/src/mpfs/Kconfig
@@ -159,7 +159,7 @@ config MPFS_DDR_TYPE
 
 config MPFS_DDR_MANUAL_BCLSCLK_TRAINING
 	bool "Use manual bclk/sclk training"
-        default n
+	default n
 	---help---
 		This adds code for manual bclk/sclk training. To use it also enable bit 0 in LIBERO_SETTING_TRAINING_SKIP_SETTING to skip the automatic one
 
diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig
index 3129dcb9c7..78c297df52 100644
--- a/arch/xtensa/src/esp32s3/Kconfig
+++ b/arch/xtensa/src/esp32s3/Kconfig
@@ -97,7 +97,7 @@ config ESP32S3_INSTRUCTION_CACHE_4WAYS
 config ESP32S3_INSTRUCTION_CACHE_8WAYS
 	bool "8 ways"
 
-endchoice
+endchoice # Instruction cache associated ways
 
 config ESP32S3_ICACHE_ASSOCIATED_WAYS
 	int
@@ -317,7 +317,7 @@ config ESP32S3_I2S0_ROLE_MASTER
 config ESP32S3_I2S0_ROLE_SLAVE
 	bool "Slave"
 
-endchoice
+endchoice # I2S0 role
 
 choice
 	prompt "Bit width"
@@ -339,7 +339,7 @@ config ESP32S3_I2S0_DATA_BIT_WIDTH_24BIT
 config ESP32S3_I2S0_DATA_BIT_WIDTH_32BIT
 	bool "32 bits"
 
-endchoice
+endchoice # Bit width
 
 config ESP32S3_I2S0_DATA_BIT_WIDTH
 	int
@@ -429,7 +429,7 @@ config ESP32S3_I2S1_ROLE_MASTER
 config ESP32S3_I2S1_ROLE_SLAVE
 	bool "Slave"
 
-endchoice
+endchoice # I2S1 role
 
 choice
 	prompt "Bit width"
@@ -1174,7 +1174,7 @@ config ESP32S3_I2CTIMEOMS
 endmenu # I2C Configuration
 
 menu "TWAI driver options"
-        depends on ESP32S3_TWAI
+	depends on ESP32S3_TWAI
 
 if ESP32S3_TWAI
 
@@ -1215,12 +1215,12 @@ config ESP32S3_TWAI_SAM
 endif # ESP32S3_TWAI
 
 config ESP32S3_TWAI_REGDEBUG
-    bool "TWAI register level debug"
-    depends on DEBUG_CAN_INFO
-    default n
-    ---help---
-        Output detailed register-level TWAI debug information. Requires also
-        CONFIG_DEBUG_CAN_INFO.
+	bool "TWAI register level debug"
+	depends on DEBUG_CAN_INFO
+	default n
+	---help---
+		Output detailed register-level TWAI debug information. Requires also
+		CONFIG_DEBUG_CAN_INFO.
 
 endmenu #ESP32S3_TWAI
 
diff --git a/binfmt/Kconfig b/binfmt/Kconfig
index c267a020cd..5587107176 100644
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@@ -76,12 +76,12 @@ choice
 config BINFMT_ELF_RELOCATABLE
 	bool "Relocatable ELF"
 	---help---
-	  Produce a relocatable object as output. This is also known as partial linking.
+		Produce a relocatable object as output. This is also known as partial linking.
 
 config BINFMT_ELF_EXECUTABLE
 	bool "Executable ELF"
 	depends on ARCH_HAVE_ELF_EXECUTABLE
 	---help---
-	   Produce a full linked executable object as output.
+		Produce a full linked executable object as output.
 
 endchoice
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 3cd778d530..7705ee00bb 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -90,7 +90,7 @@ config APDS9922_ALS_NPOLLWAITERS
 config APDS9922_PS_NPOLLWAITERS
 	int "APDS-9922 - number of PS poll waiters"
 	default 2
-	depends on SENSORS_APDS9922  
+	depends on SENSORS_APDS9922
 	---help---
 		Sets the number of poll waiters for the proximity sensor
 
diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig
index b43679d0e7..ae238e5a54 100644
--- a/drivers/usbdev/Kconfig
+++ b/drivers/usbdev/Kconfig
@@ -39,7 +39,7 @@ config USBDEV_BUSPOWERED
 	---help---
 		Will cause USB features to indicate that the device is not self-powered
 
-endchoice
+endchoice # Select USB device powered
 
 config USBDEV_MAXPOWER
 	int "Maximum power consumption in mA"
@@ -264,7 +264,7 @@ config COMPOSITE_DEVICES
 	---help---
 		Composite device class object number.
 
-endif
+endif # USBDEV_COMPOSITE
 
 config PL2303
 	bool "Prolific PL2303 serial/USB converter emulation"
@@ -362,7 +362,8 @@ config PL2303_VENDORSTR
 config PL2303_PRODUCTSTR
 	string "Product string"
 	default "PL2303 Emulation"
-endif
+
+endif # PL2303
 
 menuconfig CDCACM
 	bool "USB Modem (CDC/ACM) support"
@@ -421,7 +422,7 @@ config CDCACM_EPINTIN
 		The logical 7-bit address of a hardware endpoint that supports
 		interrupt IN operation.  Default 1.
 
-endif
+endif # !CDCACM_COMPOSITE
 
 config CDCACM_EPINTIN_FSSIZE
 	int "Interrupt IN full speed MAXPACKET size"
@@ -453,7 +454,7 @@ config CDCACM_EPBULKOUT
 		The logical 7-bit address of a hardware endpoint that supports
 		bulk OUT operation.  Default: 3
 
-endif
+endif # !CDCACM_COMPOSITE
 
 config CDCACM_EPBULKOUT_FSSIZE
 	int "Bulk OUT full speed MAXPACKET size"
@@ -1161,7 +1162,7 @@ config CDCECM_EPBULKIN
 endif # !CDCECM_COMPOSITE
 
 config CDCECM_EPBULKIN_FSSIZE
-	int "Bulk IN full speed  MAXPACKET size"
+	int "Bulk IN full speed MAXPACKET size"
 	default 64
 	---help---
 		Max package size for the bulk IN endpoint if full speed mode.
@@ -1170,7 +1171,7 @@ config CDCECM_EPBULKIN_FSSIZE
 if USBDEV_DUALSPEED
 
 config CDCECM_EPBULKIN_HSSIZE
-	int "Bulk IN high speed  MAXPACKET size"
+	int "Bulk IN high speed MAXPACKET size"
 	default 512
 	---help---
 		Max package size for the bulk IN endpoint if high speed mode.