diff --git a/arch/arm/src/nrf91/Kconfig b/arch/arm/src/nrf91/Kconfig
index 34a5a48618..902d71babd 100644
--- a/arch/arm/src/nrf91/Kconfig
+++ b/arch/arm/src/nrf91/Kconfig
@@ -382,7 +382,7 @@ config NRF91_LFCLK_XTAL
 config NRF91_LFCLK_RC
 	bool "Internal RC oscillator"
 
-endchoice
+endchoice # LFCLK source
 
 endif # NRF91_USE_LFCLK
 
@@ -424,7 +424,7 @@ config NRF91_SYSTIMER_RTC
 	---help---
 		Use RTC timer in tickless mode.
 
-endchoice
+endchoice # System Timer Source
 
 if NRF91_SYSTIMER_RTC
 
@@ -435,7 +435,7 @@ config NRF91_SYSTIMER_RTC_INSTANCE
 	---help---
 		Which RTC instance to use to drive the system timer
 
-endif
+endif # NRF91_SYSTIMER_RTC
 
 endmenu # System Timer
 
@@ -662,7 +662,7 @@ config NRF91_SPI_MASTER_INTERRUPTS
 	bool "SPI Master interrupts support"
 	default n
 
-endif #  NRF91_SPI_MASTER
+endif # NRF91_SPI_MASTER
 
 endmenu
 
@@ -725,14 +725,14 @@ config NRF91_MODEM_SHMEM_SIZE
 	hex "Modem shmem size"
 	default 0x44e8
 	---help---
-	  Shared memory size for the modem library must be calculated by user:
-	    CONFIG_NRF91_MODEM_SHMEM_SIZE = NRF_MODEM_SHMEM_CTRL_SIZE +
-	    CONFIG_NRF91_MODEM_SHMEM_TX_SIZE + CONFIG_NRF91_MODEM_SHMEM_TX_SIZE +
-	    CONFIG_NRF91_MODEM_SHMEM_TRACE_SIZE
-	    
-	    where:
-	      NRF_MODEM_SHMEM_CTRL_SIZE is a constant for a given library build
-	      and can be found in nrf_modem/include/nrf_modem.h file.
+		Shared memory size for the modem library must be calculated by user:
+			CONFIG_NRF91_MODEM_SHMEM_SIZE = NRF_MODEM_SHMEM_CTRL_SIZE +
+			CONFIG_NRF91_MODEM_SHMEM_TX_SIZE + CONFIG_NRF91_MODEM_SHMEM_TX_SIZE +
+			CONFIG_NRF91_MODEM_SHMEM_TRACE_SIZE
+
+		where:
+			NRF_MODEM_SHMEM_CTRL_SIZE is a constant for a given library build
+			and can be found in nrf_modem/include/nrf_modem.h file.
 
 config NRF91_MODEM_LOG
 	bool "Modem with logs"