diff --git a/arch/Kconfig b/arch/Kconfig
index 7ebef35f625..3f8a95ab8bb 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -253,9 +253,7 @@ config NOCACHE_MEMORY
 endif # ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 
 menu "Interrupt Configuration"
-#
-# Interrupt related configs
-#
+
 config DYNAMIC_INTERRUPTS
 	bool "Enable installation of IRQs at runtime"
 	help
@@ -314,7 +312,6 @@ config GEN_IRQ_START_VECTOR
 	  This is a hidden option which needs to be set per architecture and
 	  left alone.
 
-
 config IRQ_OFFLOAD
 	bool "Enable IRQ offload"
 	depends on TEST
@@ -330,6 +327,7 @@ endmenu
 #
 # Architecture Capabilities
 #
+
 config ARCH_HAS_TRUSTED_EXECUTION
 	bool
 
@@ -362,57 +360,51 @@ config ARCH_HAS_THREAD_ABORT
 # Hidden PM feature configs which are to be selected by
 # individual SoC.
 #
+
 config HAS_SYS_POWER_STATE_SLEEP_1
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_SLEEP_1
 	  configuration option.
 
 config HAS_SYS_POWER_STATE_SLEEP_2
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_SLEEP_2
 	  configuration option.
 
 config HAS_SYS_POWER_STATE_SLEEP_3
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_SLEEP_3
 	  configuration option.
 
 config HAS_SYS_POWER_STATE_DEEP_SLEEP_1
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_DEEP_SLEEP_1
 	  configuration option.
 
 config HAS_SYS_POWER_STATE_DEEP_SLEEP_2
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_DEEP_SLEEP_2
 	  configuration option.
 
 config HAS_SYS_POWER_STATE_DEEP_SLEEP_3
-	# Hidden
 	bool
 	help
 	  This option signifies that the target supports the SYS_POWER_STATE_DEEP_SLEEP_3
 	  configuration option.
 
 config BOOTLOADER_CONTEXT_RESTORE_SUPPORTED
-	# Hidden
 	bool
 	help
 	  This option signifies that the target has options of bootloaders
 	  that support context restore upon resume from deep sleep
 
-
-# End hidden CPU family configs
+#
+# Hidden CPU family configs
 #
 
 config CPU_HAS_TEE
@@ -498,10 +490,6 @@ config FP_SHARING
 
 endif # FLOAT
 
-#
-# End hidden PM feature configs
-#
-
 config ARCH
 	string
 	help
diff --git a/drivers/ethernet/Kconfig.e1000 b/drivers/ethernet/Kconfig.e1000
index 407970933b5..1489f9e9bfb 100644
--- a/drivers/ethernet/Kconfig.e1000
+++ b/drivers/ethernet/Kconfig.e1000
@@ -9,7 +9,6 @@ menuconfig ETH_E1000
 	help
 	  Enable Intel(R) PRO/1000 Gigabit Ethernet driver.
 
-# Hidden option
 config ETH_NIC_MODEL
 	string
 	default "e1000"
diff --git a/drivers/ethernet/Kconfig.smsc911x b/drivers/ethernet/Kconfig.smsc911x
index 9f6f2c6d796..2615b8b6069 100644
--- a/drivers/ethernet/Kconfig.smsc911x
+++ b/drivers/ethernet/Kconfig.smsc911x
@@ -6,7 +6,6 @@ menuconfig ETH_SMSC911X
 	help
 	  Enable driver for SMSC/LAN911x/9220 family of chips.
 
-# Hidden option
 config ETH_NIC_MODEL
 	string
 	default "lan9118"
diff --git a/drivers/ethernet/Kconfig.stellaris b/drivers/ethernet/Kconfig.stellaris
index b1eb0f21e51..65b5c78e733 100644
--- a/drivers/ethernet/Kconfig.stellaris
+++ b/drivers/ethernet/Kconfig.stellaris
@@ -8,7 +8,6 @@ menuconfig ETH_STELLARIS
 	help
 	  Stellaris on-board Ethernet Controller
 
-# Hidden option
 config ETH_NIC_MODEL
 	string
 	default "stellaris"