diff --git a/configs/basic-pbx/modules.conf b/configs/basic-pbx/modules.conf
index be35e287af97f190c5140d96ccc790054053e9bc..cb0a92c117ed43818f79d70c8733ed93742fb412 100644
--- a/configs/basic-pbx/modules.conf
+++ b/configs/basic-pbx/modules.conf
@@ -1,8 +1,9 @@
 [modules]
 autoload = no
 
-; This is a minimal module load. We are loading only the modules required for
-; the Asterisk features used in the Super Awesome Company configuration.
+; This is a minimal module load. We are loading only the modules
+; required for the Asterisk features used in the "Super Awesome
+; Company" configuration.
 
 ; Applications
 
@@ -110,7 +111,8 @@ load = res_sorcery_memory.so
 load = res_sorcery_realtime.so
 load = res_timing_timerfd.so
 
-; Don't load res_hep.so and kin unless you are using hep monitoring in your network
+; Do not load res_hep and kin unless you are using HEP monitoring
+; <http://sipcapture.org> in your network.
 
 noload = res_hep.so
 noload = res_hep_pjsip.so
diff --git a/configs/samples/modules.conf.sample b/configs/samples/modules.conf.sample
index 134ab897d6a11742b65156336413724bbf34e2bc..d2291ae076a986bfb24bb3c9607fd5946d1baf52 100644
--- a/configs/samples/modules.conf.sample
+++ b/configs/samples/modules.conf.sample
@@ -24,7 +24,7 @@ autoload=yes
 ; the "require" keyword. Asterisk will exit with a status code of 2
 ; if a required module does not load.
 ;
-; require = chan_pjsip.so
+;require = chan_pjsip.so
 ;
 ; If you want you can combine with preload
 ; preload-require = your_special_module.so
@@ -35,19 +35,22 @@ autoload=yes
 ; By default, load chan_oss only (automatically).
 ;
 noload => chan_alsa.so
-;noload => chan_oss.so
 noload => chan_console.so
-
+;noload => chan_oss.so
+;
+; Do not load res_hep and kin unless you are using HEP monitoring
+; <http://sipcapture.org> in your network.
+;
 noload => res_hep.so
 noload => res_hep_pjsip.so
 noload => res_hep_rtcp.so
-
+;
 ; Do not load chan_sip by default, it may conflict with res_pjsip.
 noload => chan_sip.so
-
-; The default voicemail module is app_voicemal. All voicemail modules
-; are mutually exclusive. Therefore it is better to make sure they
-; are not loaded at startup
 ;
-noload => app_voicemail_odbc.so
+; Load one of the voicemail modules as they are mutually exclusive.
+; By default, load app_voicemail only (automatically).
+;
+;noload => app_voicemail.so
 noload => app_voicemail_imap.so
+noload => app_voicemail_odbc.so