diff --git a/modules/Kconfig.imx b/modules/Kconfig.imx
index 44d13ca..21684b7 100644
--- a/modules/Kconfig.imx
+++ b/modules/Kconfig.imx
@@ -1,15 +1,12 @@
 # Kconfig - IMX M4 Core SDK
 #
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 config HAS_IMX_HAL
 	bool
 	select HAS_CMSIS
-	depends on  SOC_FAMILY_IMX
+	depends on SOC_FAMILY_IMX
 
 if HAS_IMX_HAL
 
diff --git a/modules/Kconfig.libmetal b/modules/Kconfig.libmetal
index d73f898..499e74c 100644
--- a/modules/Kconfig.libmetal
+++ b/modules/Kconfig.libmetal
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIBMETAL
 	bool "libmetal Support"
diff --git a/modules/Kconfig.mbedtls b/modules/Kconfig.mbedtls
index af7ddf8..db4815d 100644
--- a/modules/Kconfig.mbedtls
+++ b/modules/Kconfig.mbedtls
@@ -1,6 +1,5 @@
 # Kconfig - Cryptography primitive options for mbed TLS
 
-#
 # Copyright (c) 2016 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-
 
 menuconfig MBEDTLS
 	bool "mbedTLS Support"
diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux
index 95a89ac..de1ebc5 100644
--- a/modules/Kconfig.mcux
+++ b/modules/Kconfig.mcux
@@ -1,9 +1,7 @@
 # Kconfig - MCUXpresso SDK
 #
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_MCUX
 	bool
diff --git a/modules/Kconfig.microchip b/modules/Kconfig.microchip
index 3db591a..c5eb1ea 100644
--- a/modules/Kconfig.microchip
+++ b/modules/Kconfig.microchip
@@ -2,5 +2,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-menuconfig HAS_MEC_HAL
+config HAS_MEC_HAL
 	bool "Microchip MEC HAL drivers support"
diff --git a/modules/Kconfig.nordic b/modules/Kconfig.nordic
index dcda35f..308b027 100644
--- a/modules/Kconfig.nordic
+++ b/modules/Kconfig.nordic
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_NORDIC_DRIVERS
 	bool
diff --git a/modules/Kconfig.open-amp b/modules/Kconfig.open-amp
index 4b20410..10a2a9c 100644
--- a/modules/Kconfig.open-amp
+++ b/modules/Kconfig.open-amp
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config OPENAMP
 	bool "OpenAMP Support"
diff --git a/modules/Kconfig.qmsi b/modules/Kconfig.qmsi
index 92c20ca..905a638 100644
--- a/modules/Kconfig.qmsi
+++ b/modules/Kconfig.qmsi
@@ -1,12 +1,7 @@
 # Kconfig - QMSI drivers configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
-menu "QMSI"
 
 config HAS_QMSI
 	bool
@@ -16,5 +11,3 @@
 	depends on HAS_QMSI
 	help
 	  Enable QMSI driver support.
-
-endmenu
diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs
index c6d1541..41d43ab 100644
--- a/modules/Kconfig.silabs
+++ b/modules/Kconfig.silabs
@@ -1,9 +1,7 @@
 # Kconfig - Gecko SDK
 #
 # Copyright (c) 2017, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_SILABS_GECKO
 	bool
diff --git a/modules/Kconfig.simplelink b/modules/Kconfig.simplelink
index 57b35e4..d80f4e2 100644
--- a/modules/Kconfig.simplelink
+++ b/modules/Kconfig.simplelink
@@ -13,16 +13,16 @@
 	depends on MULTITHREADING
 	select NEWLIB_LIBC
 	select ERRNO
-        select POSIX_API
-        select PTHREAD_IPC
+	select POSIX_API
+	select PTHREAD_IPC
 	help
 	  Build the SimpleLink host driver
 
 # Kconfig - MSP432 SDK HAL configuration
 
 config HAS_MSP432P4XXSDK
-        bool
-        select HAS_CMSIS
+	bool
+	select HAS_CMSIS
 
 # Kconfig - CC13X2 / CC26X2 SDK HAL configuration
 
diff --git a/modules/Kconfig.st b/modules/Kconfig.st
index 8bf2788..f2827fc 100644
--- a/modules/Kconfig.st
+++ b/modules/Kconfig.st
@@ -126,4 +126,4 @@
 config USE_STDC_STTS751
 	bool
 
-endif #HAS_STMEMSC
+endif # HAS_STMEMSC
diff --git a/modules/Kconfig.stm32 b/modules/Kconfig.stm32
index 11a912f..286f468 100644
--- a/modules/Kconfig.stm32
+++ b/modules/Kconfig.stm32
@@ -1,7 +1,6 @@
 # Kconfig - STM32CUBE HAL config
 
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config HAS_STM32CUBE
@@ -380,4 +379,4 @@
 config USE_STM32_LL_UTILS
 	bool
 
-endif
+endif # HAS_STM32CUBE
diff --git a/modules/Kconfig.tinycbor b/modules/Kconfig.tinycbor
index 4aa8a20..e031d65 100644
--- a/modules/Kconfig.tinycbor
+++ b/modules/Kconfig.tinycbor
@@ -1,5 +1,4 @@
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config TINYCBOR
@@ -58,4 +57,4 @@
 	help
 	  This option enables cbor_value_to_pretty_stream function.
 
-endif #TINYCBOR
+endif # TINYCBOR
diff --git a/modules/Kconfig.tls-generic b/modules/Kconfig.tls-generic
index 501cb25..820fb94 100644
--- a/modules/Kconfig.tls-generic
+++ b/modules/Kconfig.tls-generic
@@ -1,11 +1,8 @@
 # Kconfig.tls - TLS/DTLS related options
 
-#
 # Copyright (c) 2018 Intel Corporation
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "TLS configuration"
 
diff --git a/modules/Kconfig.vega b/modules/Kconfig.vega
index 6ef88c3..b981cb7 100644
--- a/modules/Kconfig.vega
+++ b/modules/Kconfig.vega
@@ -1,5 +1,4 @@
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig VEGA_SDK_HAL
@@ -21,4 +20,3 @@
 	help
 	  Set if the flash memory (FTFA, FTFE, or FTFL) module is present in
 	  the SoC.
-