diff --git a/src/include/switch.h b/src/include/switch.h
index 364d982046..060a58ae6a 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -213,7 +213,7 @@
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 2239f12149..69b7dd34c1 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -1229,7 +1229,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h
index c3d09ee9a3..0192a6af62 100644
--- a/src/include/switch_buffer.h
+++ b/src/include/switch_buffer.h
@@ -151,7 +151,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index 526054862c..770ecbc99f 100644
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -223,7 +223,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index f8b1e91f37..478317efac 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -480,7 +480,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_config.h b/src/include/switch_config.h
index f4f665f213..693a15c140 100644
--- a/src/include/switch_config.h
+++ b/src/include/switch_config.h
@@ -110,7 +110,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_console.h b/src/include/switch_console.h
index 7e6be7f6db..b49ac157aa 100644
--- a/src/include/switch_console.h
+++ b/src/include/switch_console.h
@@ -76,7 +76,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 09e4b1b8e8..8a16fb0343 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1551,7 +1551,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_core_db.h b/src/include/switch_core_db.h
index ab5903b24a..644c308055 100644
--- a/src/include/switch_core_db.h
+++ b/src/include/switch_core_db.h
@@ -546,7 +546,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_core_event_hook.h b/src/include/switch_core_event_hook.h
index 41021c6218..a5e369e4fc 100644
--- a/src/include/switch_core_event_hook.h
+++ b/src/include/switch_core_event_hook.h
@@ -261,7 +261,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index bdf2a35cef..abb8631960 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -295,7 +295,7 @@ switch_status_t dtmf_callback(switch_core_session_t *session,
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index a2085acf2b..9089f3b71b 100644
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -346,7 +346,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_frame.h b/src/include/switch_frame.h
index 4c1cb3d27f..61b96f433a 100644
--- a/src/include/switch_frame.h
+++ b/src/include/switch_frame.h
@@ -75,7 +75,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 433626da10..825e7dc7e7 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -742,7 +742,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index 7df9c4891e..bf80e756a1 100644
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -325,7 +325,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_log.h b/src/include/switch_log.h
index f3b697bd4b..dfb225bcde 100644
--- a/src/include/switch_log.h
+++ b/src/include/switch_log.h
@@ -128,7 +128,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index 62bb76766d..d0ed1fddd3 100644
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -604,7 +604,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_odbc.h b/src/include/switch_odbc.h
index f36588eb81..568e15d088 100644
--- a/src/include/switch_odbc.h
+++ b/src/include/switch_odbc.h
@@ -75,7 +75,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 49962df42d..6e0588e959 100644
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -318,7 +318,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_regex.h b/src/include/switch_regex.h
index e34a2f6559..d698aa2e2d 100644
--- a/src/include/switch_regex.h
+++ b/src/include/switch_regex.h
@@ -73,7 +73,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h
index 747010fee1..1f32d3e3cb 100644
--- a/src/include/switch_resample.h
+++ b/src/include/switch_resample.h
@@ -172,7 +172,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index 4f5627a048..8faf1d86ea 100644
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -427,7 +427,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_scheduler.h b/src/include/switch_scheduler.h
index d1477d0139..12ce9693ce 100644
--- a/src/include/switch_scheduler.h
+++ b/src/include/switch_scheduler.h
@@ -96,7 +96,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index a4f2100996..725cd82e35 100644
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -236,7 +236,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 8f4ab6a715..14b38ae4f6 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1213,7 +1213,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 88899aa8d4..4cfdec3483 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -366,7 +366,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index 83413444a2..4077e19e05 100644
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -354,7 +354,7 @@ SWITCH_END_EXTERN_C
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index dbdf0ab9eb..d6e87ea0db 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -2272,7 +2272,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c03823a6c1..16639363dc 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -5103,7 +5103,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_conference_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 8f057efee2..2fecb32e12 100644
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -1637,7 +1637,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c
index 9a08f236be..41fb9ff8ee 100644
--- a/src/mod/applications/mod_enum/mod_enum.c
+++ b/src/mod/applications/mod_enum/mod_enum.c
@@ -733,7 +733,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_esf/mod_esf.c b/src/mod/applications/mod_esf/mod_esf.c
index 78524567a9..f6336a03d6 100644
--- a/src/mod/applications/mod_esf/mod_esf.c
+++ b/src/mod/applications/mod_esf/mod_esf.c
@@ -247,7 +247,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_esf_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/applications/mod_rss/mod_rss.c b/src/mod/applications/mod_rss/mod_rss.c
index 71cb0495b2..c514408489 100644
--- a/src/mod/applications/mod_rss/mod_rss.c
+++ b/src/mod/applications/mod_rss/mod_rss.c
@@ -643,7 +643,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_rss_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
index 36a3ccb157..33aeabe4b6 100644
--- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
+++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
@@ -432,7 +432,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cepstral_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
index 97b1d8269e..dc9feae474 100644
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
@@ -987,7 +987,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_amr/mod_amr.c b/src/mod/codecs/mod_amr/mod_amr.c
index d198302a74..ded9e4d196 100644
--- a/src/mod/codecs/mod_amr/mod_amr.c
+++ b/src/mod/codecs/mod_amr/mod_amr.c
@@ -340,7 +340,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_amr_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_g711/mod_g711.c b/src/mod/codecs/mod_g711/mod_g711.c
index 9ec6a9cbad..8d73632fa4 100644
--- a/src/mod/codecs/mod_g711/mod_g711.c
+++ b/src/mod/codecs/mod_g711/mod_g711.c
@@ -411,7 +411,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g711_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_g722/mod_g722.c b/src/mod/codecs/mod_g722/mod_g722.c
index aaa1237b55..cb7d8e334d 100644
--- a/src/mod/codecs/mod_g722/mod_g722.c
+++ b/src/mod/codecs/mod_g722/mod_g722.c
@@ -175,7 +175,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g722_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_g723_1/mod_g723_1.c b/src/mod/codecs/mod_g723_1/mod_g723_1.c
index 78afa6322d..1f9a0db5e3 100644
--- a/src/mod/codecs/mod_g723_1/mod_g723_1.c
+++ b/src/mod/codecs/mod_g723_1/mod_g723_1.c
@@ -203,7 +203,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g723_1_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_g726/mod_g726.c b/src/mod/codecs/mod_g726/mod_g726.c
index 047b00b96a..887eb6ca3a 100644
--- a/src/mod/codecs/mod_g726/mod_g726.c
+++ b/src/mod/codecs/mod_g726/mod_g726.c
@@ -380,7 +380,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g726_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_g729/mod_g729.c b/src/mod/codecs/mod_g729/mod_g729.c
index fc0073041c..2ace6da081 100644
--- a/src/mod/codecs/mod_g729/mod_g729.c
+++ b/src/mod/codecs/mod_g729/mod_g729.c
@@ -308,7 +308,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_gsm/mod_gsm.c b/src/mod/codecs/mod_gsm/mod_gsm.c
index d0489bd5fe..35e58bc9cd 100644
--- a/src/mod/codecs/mod_gsm/mod_gsm.c
+++ b/src/mod/codecs/mod_gsm/mod_gsm.c
@@ -172,7 +172,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_gsm_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_h26x/mod_h26x.c b/src/mod/codecs/mod_h26x/mod_h26x.c
index 083ea5d09a..d32e2bd30f 100644
--- a/src/mod/codecs/mod_h26x/mod_h26x.c
+++ b/src/mod/codecs/mod_h26x/mod_h26x.c
@@ -154,7 +154,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.c b/src/mod/codecs/mod_ilbc/mod_ilbc.c
index 493f563bef..6edb7a4814 100644
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.c
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.c
@@ -301,7 +301,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_ilbc_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_l16/mod_l16.c b/src/mod/codecs/mod_l16/mod_l16.c
index 606804ce59..8f62cd2f06 100644
--- a/src/mod/codecs/mod_l16/mod_l16.c
+++ b/src/mod/codecs/mod_l16/mod_l16.c
@@ -432,7 +432,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_l16_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/codecs/mod_speex/mod_speex.c b/src/mod/codecs/mod_speex/mod_speex.c
index 6001f88beb..8684636a16 100644
--- a/src/mod/codecs/mod_speex/mod_speex.c
+++ b/src/mod/codecs/mod_speex/mod_speex.c
@@ -407,7 +407,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_speex_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c b/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c
index e85f6c6a7c..ff92d0838e 100644
--- a/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c
+++ b/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c
@@ -414,7 +414,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_asterisk_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
index 09f4cbb25d..0e7ace9f25 100644
--- a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
+++ b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
@@ -167,7 +167,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
index dc5bf79262..0c27de0115 100644
--- a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
+++ b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
@@ -299,7 +299,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_xml_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/directories/mod_ldap/mod_ldap.c b/src/mod/directories/mod_ldap/mod_ldap.c
index 320a1e9245..29c711ccec 100644
--- a/src/mod/directories/mod_ldap/mod_ldap.c
+++ b/src/mod/directories/mod_ldap/mod_ldap.c
@@ -224,7 +224,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_ldap_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c
index 1c43d1cc8b..c603041d9d 100644
--- a/src/mod/endpoints/mod_alsa/mod_alsa.c
+++ b/src/mod/endpoints/mod_alsa/mod_alsa.c
@@ -1706,7 +1706,7 @@ SWITCH_STANDARD_API(pa_cmd)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index dcb5ae9f87..5c0be8c7fd 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -2988,7 +2988,7 @@ static ldl_status handle_response(ldl_handle_t * handle, char *id)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index a21f10328a..9f179bc99a 100644
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -1251,7 +1251,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_iax_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 2d5a030c69..196e6d5a1d 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1864,7 +1864,7 @@ SWITCH_STANDARD_API(pa_cmd)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 81d5968015..973c6f9c68 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1970,7 +1970,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 928ca2cbde..a5a4fbc1f9 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2895,7 +2895,7 @@ static void set_variable_sip_param(switch_channel_t *channel, char *header_type,
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 8fc9a51eab..5c889c473a 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2425,7 +2425,7 @@ int sofia_glue_get_user_host(char *in, char **user, char **host)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index e579355d28..39f63e99b7 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1394,7 +1394,7 @@ void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index 8f7735cb24..6db0a3c43d 100644
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1135,7 +1135,7 @@ switch_status_t sofia_reg_add_gateway(char *key, sofia_gateway_t *gateway)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index e205abb4de..e0697dcb35 100644
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -2501,7 +2501,7 @@ static switch_status_t config_wanpipe(int reload)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c
index 4ebe0b142b..6e2568aca9 100644
--- a/src/mod/endpoints/mod_woomera/mod_woomera.c
+++ b/src/mod/endpoints/mod_woomera/mod_woomera.c
@@ -1397,7 +1397,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_woomera_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
index 3c92160464..1a85ab8649 100644
--- a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
+++ b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
@@ -360,7 +360,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_csv_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
index ed9445566f..4786d6c91c 100644
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
+++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
@@ -328,7 +328,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 89f63f868d..f3465e55bd 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -1341,7 +1341,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_event_test/mod_event_test.c b/src/mod/event_handlers/mod_event_test/mod_event_test.c
index 4d065ba214..ae7bac5149 100644
--- a/src/mod/event_handlers/mod_event_test/mod_event_test.c
+++ b/src/mod/event_handlers/mod_event_test/mod_event_test.c
@@ -143,7 +143,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_event_test_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
index bb3818ba28..4270cad225 100644
--- a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
+++ b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
@@ -483,7 +483,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c
index a5026d18fd..f39fc4f14f 100644
--- a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c
+++ b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c
@@ -304,7 +304,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_zeroconf_runtime)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/formats/mod_local_stream/mod_local_stream.c b/src/mod/formats/mod_local_stream/mod_local_stream.c
index 4fb406099d..a5c1eda693 100644
--- a/src/mod/formats/mod_local_stream/mod_local_stream.c
+++ b/src/mod/formats/mod_local_stream/mod_local_stream.c
@@ -472,7 +472,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_local_stream_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/formats/mod_native_file/mod_native_file.c b/src/mod/formats/mod_native_file/mod_native_file.c
index 9767aee20e..0ff7935ac5 100644
--- a/src/mod/formats/mod_native_file/mod_native_file.c
+++ b/src/mod/formats/mod_native_file/mod_native_file.c
@@ -165,7 +165,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_native_file_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/formats/mod_sndfile/mod_sndfile.c b/src/mod/formats/mod_sndfile/mod_sndfile.c
index 68c2ea8d82..370f4b17d5 100644
--- a/src/mod/formats/mod_sndfile/mod_sndfile.c
+++ b/src/mod/formats/mod_sndfile/mod_sndfile.c
@@ -401,7 +401,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sndfile_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/formats/mod_tone_stream/mod_tone_stream.c b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
index 0f29040650..3ffb4cbf47 100644
--- a/src/mod/formats/mod_tone_stream/mod_tone_stream.c
+++ b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
@@ -156,7 +156,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_python/mod_python.c b/src/mod/languages/mod_python/mod_python.c
index df25eaa895..8cb5a65fce 100644
--- a/src/mod/languages/mod_python/mod_python.c
+++ b/src/mod/languages/mod_python/mod_python.c
@@ -336,7 +336,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index fda39841b6..a18efb6c4c 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -3539,7 +3539,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
index 8f5d66e2db..9250e407e5 100644
--- a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
+++ b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
@@ -341,7 +341,7 @@ SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
index 9eee62c05d..c5b0a0d09a 100644
--- a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
+++ b/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
@@ -235,7 +235,7 @@ SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
index 5fcc57fe0d..59b0b1bb10 100644
--- a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
+++ b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
@@ -483,7 +483,7 @@ SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c b/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
index 76831f05c4..1abf5485ba 100644
--- a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
+++ b/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
@@ -345,7 +345,7 @@ SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
index b8db914441..8e53c79892 100644
--- a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
+++ b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
@@ -359,7 +359,7 @@ SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c
index d2e11477ee..52999ff76a 100644
--- a/src/mod/loggers/mod_console/mod_console.c
+++ b/src/mod/loggers/mod_console/mod_console.c
@@ -354,7 +354,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_console_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_de/mod_say_de.c b/src/mod/say/mod_say_de/mod_say_de.c
index fa1dfdee1c..ebea1991ac 100644
--- a/src/mod/say/mod_say_de/mod_say_de.c
+++ b/src/mod/say/mod_say_de/mod_say_de.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_de_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_en/mod_say_en.c b/src/mod/say/mod_say_en/mod_say_en.c
index beb1cc7790..9aa74cb34d 100644
--- a/src/mod/say/mod_say_en/mod_say_en.c
+++ b/src/mod/say/mod_say_en/mod_say_en.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_es/mod_say_es.c b/src/mod/say/mod_say_es/mod_say_es.c
index 3e17a096e8..9989e55c3e 100644
--- a/src/mod/say/mod_say_es/mod_say_es.c
+++ b/src/mod/say/mod_say_es/mod_say_es.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_es_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_fr/mod_say_fr.c b/src/mod/say/mod_say_fr/mod_say_fr.c
index 9d26a70147..ebd7accf39 100644
--- a/src/mod/say/mod_say_fr/mod_say_fr.c
+++ b/src/mod/say/mod_say_fr/mod_say_fr.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_fr_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_it/mod_say_it.c b/src/mod/say/mod_say_it/mod_say_it.c
index 851dc9a0ad..99e590b008 100644
--- a/src/mod/say/mod_say_it/mod_say_it.c
+++ b/src/mod/say/mod_say_it/mod_say_it.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_it_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/say/mod_say_nl/mod_say_nl.c b/src/mod/say/mod_say_nl/mod_say_nl.c
index 30e9ffcd7e..14a5e77eca 100644
--- a/src/mod/say/mod_say_nl/mod_say_nl.c
+++ b/src/mod/say/mod_say_nl/mod_say_nl.c
@@ -540,7 +540,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_nl_load)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index 2defd680df..f282a734eb 100644
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -344,7 +344,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
index 52712add1d..5e59cc5c35 100644
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -310,7 +310,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
index 7b1cf2795a..2a1c503622 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
@@ -785,7 +785,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch.c b/src/switch.c
index bac72454bd..8daed26bb4 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -493,7 +493,7 @@ int main(int argc, char *argv[])
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_apr.c b/src/switch_apr.c
index 39bca828f0..2a7b2235ad 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -841,7 +841,7 @@ SWITCH_DECLARE(switch_status_t) switch_match_glob(const char *pattern, switch_ar
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_buffer.c b/src/switch_buffer.c
index d3a0ee9909..f8b9b18841 100644
--- a/src/switch_buffer.c
+++ b/src/switch_buffer.c
@@ -320,7 +320,7 @@ SWITCH_DECLARE(void) switch_buffer_destroy(switch_buffer_t **buffer)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_caller.c b/src/switch_caller.c
index d319bcfb09..8cd0a34ccc 100644
--- a/src/switch_caller.c
+++ b/src/switch_caller.c
@@ -304,7 +304,7 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 1e9a7abb7e..c3d207abd1 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1977,7 +1977,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_config.c b/src/switch_config.c
index 868a50b422..f16b11b01d 100644
--- a/src/switch_config.c
+++ b/src/switch_config.c
@@ -201,7 +201,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t * cfg, char **var, c
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_console.c b/src/switch_console.c
index bb416434d1..daa6acc15a 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -376,7 +376,7 @@ SWITCH_DECLARE(void) switch_console_loop(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core.c b/src/switch_core.c
index a043d2805a..63d872c7aa 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1098,7 +1098,7 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim_all(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_asr.c b/src/switch_core_asr.c
index 3fd88f1463..2f8a0174e7 100644
--- a/src/switch_core_asr.c
+++ b/src/switch_core_asr.c
@@ -163,7 +163,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_asr_get_results(switch_asr_handle_t
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c
index f99a00c4aa..2cefeef5de 100644
--- a/src/switch_core_codec.c
+++ b/src/switch_core_codec.c
@@ -261,7 +261,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_db.c b/src/switch_core_db.c
index 40ca6f2bfb..be8f008069 100644
--- a/src/switch_core_db.c
+++ b/src/switch_core_db.c
@@ -219,7 +219,7 @@ SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *te
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_directory.c b/src/switch_core_directory.c
index 21d024e526..94d031d9ea 100644
--- a/src/switch_core_directory.c
+++ b/src/switch_core_directory.c
@@ -88,7 +88,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_directory_close(switch_directory_han
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_event_hook.c b/src/switch_core_event_hook.c
index eb53093cf3..f41b505e8e 100644
--- a/src/switch_core_event_hook.c
+++ b/src/switch_core_event_hook.c
@@ -48,7 +48,7 @@ NEW_HOOK_DECL(recv_dtmf)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_file.c b/src/switch_core_file.c
index f7960bc7e0..5d113ae9bb 100644
--- a/src/switch_core_file.c
+++ b/src/switch_core_file.c
@@ -301,7 +301,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_hash.c b/src/switch_core_hash.c
index 082943546b..9e9e48478f 100644
--- a/src/switch_core_hash.c
+++ b/src/switch_core_hash.c
@@ -152,7 +152,7 @@ SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key,
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index 871a220bfb..8b787c9568 100644
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -993,7 +993,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c
index 446d9ad81d..e81276a31e 100644
--- a/src/switch_core_media_bug.c
+++ b/src/switch_core_media_bug.c
@@ -350,7 +350,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_memory.c b/src/switch_core_memory.c
index 78f212e976..c3e8a2c927 100644
--- a/src/switch_core_memory.c
+++ b/src/switch_core_memory.c
@@ -429,7 +429,7 @@ switch_memory_pool_t *switch_core_memory_init(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_port_allocator.c b/src/switch_core_port_allocator.c
index f5f5f693b9..72ae3e083e 100644
--- a/src/switch_core_port_allocator.c
+++ b/src/switch_core_port_allocator.c
@@ -200,7 +200,7 @@ SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocat
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c
index 1e6e35cd75..a761419d4b 100644
--- a/src/switch_core_rwlock.c
+++ b/src/switch_core_rwlock.c
@@ -89,7 +89,7 @@ SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index f6245fe970..cd63c8c5a4 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1094,7 +1094,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_speech.c b/src/switch_core_speech.c
index 1d07e0f880..dbaa07be76 100644
--- a/src/switch_core_speech.c
+++ b/src/switch_core_speech.c
@@ -152,7 +152,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_close(switch_speech_handle_t
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index e33de610fd..8b1be2e930 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -431,7 +431,7 @@ void switch_core_sqldb_stop(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 4e8d1d0cfa..1dbccf7094 100644
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -492,7 +492,7 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_core_timer.c b/src/switch_core_timer.c
index 9c3d1bd26a..9485753378 100644
--- a/src/switch_core_timer.c
+++ b/src/switch_core_timer.c
@@ -119,7 +119,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_destroy(switch_timer_t *timer)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_event.c b/src/switch_event.c
index 32be830377..9598400e67 100644
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -1345,7 +1345,7 @@ SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, co
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 709aae696c..714fcc1efe 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1599,7 +1599,7 @@ SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint3
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index b6732add50..5b25b6630e 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -1781,7 +1781,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_broadcast(const char *uuid, const cha
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 275d84f685..07fd4ce9b6 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -868,7 +868,7 @@ SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr_menu.c b/src/switch_ivr_menu.c
index 55a6ba3507..544e3658c2 100644
--- a/src/switch_ivr_menu.c
+++ b/src/switch_ivr_menu.c
@@ -681,7 +681,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index bbdf718a8a..33f86b8ac4 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1273,7 +1273,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 58dda917a4..015ffbb7c7 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -1666,7 +1666,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *ses
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 470d308a91..bbdb1fbc23 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -1441,7 +1441,7 @@ SWITCH_DECLARE(void *) switch_loadable_module_create_interface(switch_loadable_m
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_log.c b/src/switch_log.c
index 66d51a36a5..e46126c280 100644
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -98,8 +98,6 @@ SWITCH_DECLARE(uint32_t) switch_log_str2mask(const char *str)
 	return mask;
 }
 
-
-
 SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str)
 {
 	int x = 0;
@@ -307,7 +305,6 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
 	fflush(handle);
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool)
 {
 	switch_thread_t *thread;
@@ -359,7 +356,7 @@ SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_odbc.c b/src/switch_odbc.c
index c75fbc9ca4..6479329a48 100644
--- a/src/switch_odbc.c
+++ b/src/switch_odbc.c
@@ -43,7 +43,6 @@ struct switch_odbc_handle {
 	BOOL is_firebird;
 };
 
-
 SWITCH_DECLARE(switch_odbc_handle_t *) switch_odbc_handle_new(char *dsn, char *username, char *password)
 {
 	switch_odbc_handle_t *new_handle;
@@ -175,7 +174,6 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_connect(switch_odbc_hand
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn);
 	handle->state = SWITCH_ODBC_STATE_CONNECTED;
 	return SWITCH_ODBC_SUCCESS;
-
 }
 
 static int db_is_up(switch_odbc_handle_t *handle)
@@ -226,7 +224,6 @@ static int db_is_up(switch_odbc_handle_t *handle)
 	err_str = switch_odbc_handle_get_error(handle, stmt);
 	recon = switch_odbc_handle_connect(handle);
 
-	
 	max_tries--;
 
 	if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) {
@@ -266,11 +263,9 @@ static int db_is_up(switch_odbc_handle_t *handle)
 		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
 	}
 
-	return ret;
-	
+	return ret;	
 }
 
-
 SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec(switch_odbc_handle_t *handle, char *sql, SQLHSTMT *rstmt)
 {
 	SQLHSTMT stmt = NULL;
@@ -308,11 +303,9 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec(switch_odbc_handle_
     } else if (stmt) {
 		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
 	}
-	return SWITCH_ODBC_FAIL;
-	
+	return SWITCH_ODBC_FAIL;	
 }
 
-
 SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_callback_exec(switch_odbc_handle_t *handle,
 																	  char *sql, switch_core_db_callback_func_t callback, void *pdata)
 {
@@ -341,7 +334,6 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_callback_exec(switch_odb
 		goto error;
 	}
 
-
 	SQLNumResultCols(stmt, &c);
 	SQLRowCount(stmt, &m);
 
@@ -400,10 +392,8 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_callback_exec(switch_odb
 	}
 
 	return SWITCH_ODBC_FAIL;
-
 }
 
-
 SWITCH_DECLARE(void) switch_odbc_handle_destroy(switch_odbc_handle_t **handlep)
 {
 	switch_odbc_handle_t *handle = NULL;
@@ -450,7 +440,7 @@ SWITCH_DECLARE(char *) switch_odbc_handle_get_error(switch_odbc_handle_t *handle
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_regex.c b/src/switch_regex.c
index 667ac43840..7e28e9c3c0 100644
--- a/src/switch_regex.c
+++ b/src/switch_regex.c
@@ -86,7 +86,6 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
 		}
 	}
 
-
 	re = pcre_compile(expression,	/* the pattern */
 					  flags,		/* default options */
 					  &error,	/* for error message */
@@ -120,7 +119,6 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
 	return match_count;
 }
 
-
 SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data,
 												 char *substituted, switch_size_t len, int *ovector)
 {
@@ -204,13 +202,10 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const cha
 	}
 }
 
-
-
-
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_resample.c b/src/switch_resample.c
index cda0424074..c2984fcefc 100644
--- a/src/switch_resample.c
+++ b/src/switch_resample.c
@@ -84,7 +84,6 @@ SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t
 #endif
 }
 
-
 SWITCH_DECLARE(uint32_t) switch_resample_process(switch_audio_resampler_t *resampler, float *src, int srclen, float *dst, uint32_t dstlen, int last)
 {
 #ifdef DISABLE_RESAMPLE
@@ -123,7 +122,6 @@ SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t **resample
 	}
 }
 
-
 SWITCH_DECLARE(switch_size_t) switch_float_to_short(float *f, short *s, switch_size_t len)
 {
 	switch_size_t i;
@@ -238,10 +236,8 @@ SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16
 	}
 
 	return x;
-
 }
 
-
 SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol)
 {
 	double newrate = 0;
@@ -278,7 +274,7 @@ SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, i
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index b5b4c9fbd4..f4b3d381f8 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -80,7 +80,6 @@ typedef struct {
 	char body[SWITCH_RTP_MAX_BUF_LEN];
 } rtp_msg_t;
 
-
 struct switch_rtp_vad_data {
 	switch_core_session_t *session;
 	switch_codec_t vad_codec;
@@ -103,7 +102,6 @@ struct switch_rtp_vad_data {
 	time_t next_scan;
 };
 
-
 struct switch_rtp_rfc2833_data {
 	switch_queue_t *dtmf_queue;
 	char out_digit;
@@ -233,7 +231,6 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session)
  end:
 	WRITE_DEC(rtp_session);
 	
-
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -245,7 +242,6 @@ static void handle_ice(switch_rtp_t *rtp_session, void *data, switch_size_t len)
 	unsigned char buf[512] = { 0 };
 	switch_size_t cpylen = len;
 
-
 	READ_INC(rtp_session);
 	WRITE_INC(rtp_session);
 	
@@ -395,7 +391,6 @@ SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip)
 	return port;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err)
 {
 	switch_socket_t *new_sock = NULL, *old_sock = NULL;
@@ -614,7 +609,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session,
 												  switch_payload_t payload,
 												  uint32_t samples_per_interval,
@@ -923,7 +917,6 @@ SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp
 	switch_clear_flag_locked(rtp_session, flags);
 }
 
-
 static void do_2833(switch_rtp_t *rtp_session)
 {
 	switch_frame_flag_t flags = 0;
@@ -947,7 +940,6 @@ static void do_2833(switch_rtp_t *rtp_session)
 		rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (rtp_session->dtmf_data.out_digit_sub_sofar >> 8);
 		rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sub_sofar;
 
-		
 		for (x = 0; x < loops; x++) {
 			switch_rtp_write_manual(rtp_session,
 									rtp_session->dtmf_data.out_digit_packet,
@@ -1010,7 +1002,6 @@ static void do_2833(switch_rtp_t *rtp_session)
 				}
 			}
 
-
 			switch_rtp_write_manual(rtp_session,
 									rtp_session->dtmf_data.out_digit_packet,
 									4,
@@ -1090,7 +1081,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			}
 
 			bytes = sbytes;
-
 		}
 
 		if (rtp_session->jb && bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) {
@@ -1312,7 +1302,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
         } else {
             switch_yield(1000);
         }
-
 	}
 
 	*payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt;
@@ -1347,7 +1336,6 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_has_dtmf(switch_rtp_t *rtp_session)
 	return has;
 }
 
-
 SWITCH_DECLARE(switch_size_t) switch_rtp_dequeue_dtmf(switch_rtp_t *rtp_session, switch_dtmf_t *dtmf)
 {
 	switch_size_t bytes = 0;
@@ -1369,7 +1357,6 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_dequeue_dtmf(switch_rtp_t *rtp_session,
 	return bytes;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_queue_rfc2833(switch_rtp_t *rtp_session, const switch_dtmf_t *dtmf)
 {
 
@@ -1392,10 +1379,8 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_queue_rfc2833(switch_rtp_t *rtp_sessi
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_queue_rfc2833_in(switch_rtp_t *rtp_session, const switch_dtmf_t *dtmf)
 {
-
 	switch_dtmf_t *rdigit;
 
 	if (!switch_rtp_ready(rtp_session)) {
@@ -1481,7 +1466,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read(switch_rtp_t *rtp_session,
 														 void **data, uint32_t * datalen, switch_payload_t *payload_type, switch_frame_flag_t *flags)
 {
@@ -1738,10 +1722,8 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 	WRITE_DEC(rtp_session);
 
 	return ret;
-
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_rtp_disable_vad(switch_rtp_t *rtp_session)
 {
 
@@ -1760,7 +1742,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_disable_vad(switch_rtp_t *rtp_session
 SWITCH_DECLARE(switch_status_t) switch_rtp_enable_vad(switch_rtp_t *rtp_session, switch_core_session_t *session, switch_codec_t *codec,
 													  switch_vad_flag_t flags)
 {
-
 	if (!switch_rtp_ready(rtp_session)) {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -1903,7 +1884,6 @@ SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
 	WRITE_DEC(rtp_session);
 
 	return ret;
-
 }
 
 SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)
@@ -1924,7 +1904,7 @@ SWITCH_DECLARE(void *) switch_rtp_get_private(switch_rtp_t *rtp_session)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c
index cda0837a07..0652349bb7 100644
--- a/src/switch_scheduler.c
+++ b/src/switch_scheduler.c
@@ -298,7 +298,6 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)
 	switch_thread_create(&thread, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
 }
 
-
 SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)
 {
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping Task Thread\n");
@@ -319,7 +318,7 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_stun.c b/src/switch_stun.c
index 817324a5fa..bf0b0fed0f 100644
--- a/src/switch_stun.c
+++ b/src/switch_stun.c
@@ -113,8 +113,6 @@ SWITCH_DECLARE(void) switch_stun_random_string(char *buf, uint16_t len, char *se
 	}
 }
 
-
-
 SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t * buf, uint32_t len)
 {
 	switch_stun_packet_t *packet;
@@ -140,7 +138,6 @@ SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t * buf, u
 				switch_stun_ip_t *ip;
 				ip = (switch_stun_ip_t *) attr->value;
 				ip->port = ntohs(ip->port);
-
 			}
 			break;
 		}
@@ -363,14 +360,13 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 		*err = "Invalid Reply";
 	}
 
-
 	return SWITCH_STATUS_FALSE;
 }
 
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_swig.c b/src/switch_swig.c
index e5e81ba13b..9f2c0b31e3 100644
--- a/src/switch_swig.c
+++ b/src/switch_swig.c
@@ -150,7 +150,6 @@ void fs_channel_set_state(switch_core_session_t *session, char *state)
 	}
 }
 
-
 /*
   IVR Routines!  You can do IVR in PHP NOW!
 */
@@ -246,8 +245,6 @@ int fs_switch_ivr_originate(switch_core_session_t *session, switch_core_session_
 		switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
         switch_core_session_rwunlock(peer_session);
 	}
-
-
 }
 
 int fs_switch_ivr_session_transfer(switch_core_session_t *session, char *extension, char *dialplan, char *context)
@@ -266,7 +263,6 @@ int fs_switch_ivr_speak_text(switch_core_session_t *session, char *tts_name, cha
 	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
 }
 
-
 /*
 
 *******  CHANNEL STUFF  *******
@@ -278,7 +274,6 @@ char *fs_switch_channel_get_variable(switch_channel_t *channel, char *varname)
 	return switch_channel_get_variable(channel, varname);
 }
 
-
 int fs_switch_channel_set_variable(switch_channel_t *channel, char *varname, char *value)
 {
 	switch_status_t status;
diff --git a/src/switch_time.c b/src/switch_time.c
index e735789909..4c460d8907 100644
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -80,7 +80,6 @@ typedef struct timer_matrix timer_matrix_t;
 
 static timer_matrix_t TIMER_MATRIX[MAX_ELEMENTS + 1];
 
-
 SWITCH_DECLARE(switch_time_t) switch_timestamp_now(void)
 {
 	return runtime.timestamp ? runtime.timestamp : switch_time_now();
@@ -129,8 +128,6 @@ SWITCH_DECLARE(void) switch_time_sync(void)
 	runtime.reference = time_now(runtime.offset);
 }
 
-
-
 SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 {
 
@@ -152,8 +149,6 @@ SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 
 }
 
-
-
 static switch_status_t timer_init(switch_timer_t *timer)
 {
 	timer_private_t *private_info;
@@ -184,14 +179,11 @@ static switch_status_t timer_init(switch_timer_t *timer)
 	return SWITCH_STATUS_MEMERR;
 }
 
-
 #define check_roll() if (private_info->roll < TIMER_MATRIX[timer->interval].roll) {\
 		private_info->roll++;\
 		private_info->reference = private_info->start = TIMER_MATRIX[timer->interval].tick;\
 	}\
 
-
-
 static switch_status_t timer_step(switch_timer_t *timer)
 {
 	timer_private_t *private_info = timer->private_info;
@@ -215,7 +207,6 @@ static switch_status_t timer_step(switch_timer_t *timer)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 static switch_status_t timer_next(switch_timer_t *timer)
 {
 	timer_private_t *private_info = timer->private_info;
@@ -261,7 +252,6 @@ static switch_status_t timer_check(switch_timer_t *timer)
 	return status;
 }
 
-
 static switch_status_t timer_destroy(switch_timer_t *timer)
 {
 	timer_private_t *private_info = timer->private_info;
@@ -275,7 +265,6 @@ static switch_status_t timer_destroy(switch_timer_t *timer)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
 {
 	switch_time_t too_late = STEP_MIC * 128;
@@ -380,7 +369,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
 	return SWITCH_STATUS_TERM;
 }
 
-
 SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)
 {
 	switch_timer_interface_t *timer_interface;
@@ -419,7 +407,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 3af7769c71..947cbb8e23 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -64,7 +64,6 @@ SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char clos
 	return (char *)e;
 }
 
-
 SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len)
 {
 	char c, *p;
@@ -133,7 +132,6 @@ SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len)
 	return buf;
 }
 
-
 static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 #define B64BUFFLEN 1024
 SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen)
@@ -167,7 +165,6 @@ SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size
     return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_size_t) switch_b64_decode(char *in, char *out, switch_size_t olen)
 {
 
@@ -208,7 +205,6 @@ SWITCH_DECLARE(switch_size_t) switch_b64_decode(char *in, char *out, switch_size
 	return ol;
 }
 
-
 static int write_buf(int fd, const char *buf)
 {
 
@@ -322,8 +318,6 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *fr
 
         }
 
-
-
         if (file) {
             switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
             if (!write_buf(fd, buf))
@@ -377,8 +371,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip)
 			strncmp(ip, "172.31.", 7) &&
 			strncmp(ip, "192.0.2.", 8) &&
 			strncmp(ip, "169.254.", 8)
-			) ? SWITCH_FALSE : SWITCH_TRUE;
-	
+			) ? SWITCH_FALSE : SWITCH_TRUE;	
 }
 
 SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len)
@@ -452,7 +445,6 @@ SWITCH_DECLARE(char *) switch_strip_spaces(const char *str)
 	return s;
 }
 
-
 SWITCH_DECLARE(char *) switch_separate_paren_args(char *str)
 {
 	char *e, *args;
@@ -497,7 +489,6 @@ SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str)
 	return r;
 }
 
-
 SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str)
 {
 /*
@@ -508,7 +499,6 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str)
 **
 ** Hereby donated to public domain.
 */
-
 	const char *pptr, *sptr, *start;
 
 	if (!str || !instr)
@@ -539,7 +529,6 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str)
 	return NULL;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family)
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
@@ -574,7 +563,6 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int fam
 		break;
 	}
 
-
 #ifdef WIN32
 	tmp_socket = socket(family, SOCK_DGRAM, 0);
 
@@ -671,7 +659,6 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int fam
 		break;
 	}
 
-
   doh:
 	if (tmp_socket > 0) {
 		close(tmp_socket);
@@ -680,10 +667,8 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int fam
 #endif
 
 	return status;
-
 }
 
-
 SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in)
 {
 	switch_time_exp_t tm = { 0 };
@@ -733,7 +718,6 @@ SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in)
 	}
 	/* possible else with more patterns later */
 	return ret;
-
 }
 
 SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority)
@@ -1213,7 +1197,6 @@ SWITCH_DECLARE(const char *) switch_cut_path(const char *in)
 	}
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len)
 {
 	size_t i;
@@ -1275,7 +1258,6 @@ SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t * poll, int ms)
 	return nsds;
 }
 
-
 SWITCH_DECLARE(size_t) switch_url_encode(const char *url, char *buf, size_t len)
 {
 	const char *p;
@@ -1328,11 +1310,10 @@ SWITCH_DECLARE(char *) switch_url_decode(char *s)
 	return s;
 }
 
-
 /* For Emacs:
  * Local Variables:
  * mode:c
- * indent-tabs-mode:t
+ * indent-tabs-mode:nil
  * tab-width:4
  * c-basic-offset:4
  * End:
diff --git a/src/switch_xml.cpp b/src/switch_xml.cpp
index 484a9e7008..2f675a3c86 100644
--- a/src/switch_xml.cpp
+++ b/src/switch_xml.cpp
@@ -111,7 +111,6 @@ struct xml_section_t {
 	uint32_t section;
 };
 
-
 static struct xml_section_t SECTIONS[] = {
 	{"result", SWITCH_XML_SECTION_RESULT},
 	{"config", SWITCH_XML_SECTION_CONFIG},
@@ -170,7 +169,6 @@ SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_searc
 	return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, const char *childname, const char *attrname, const char *value)
 {
 	switch_xml_t p = NULL;
@@ -976,7 +974,6 @@ static char *expand_vars(char *buf, char *ebuf, switch_size_t elen, switch_size_
 					}
 				}
 			}
-
 		}
 
 		*wp++ = *rp++;
@@ -985,7 +982,6 @@ static char *expand_vars(char *buf, char *ebuf, switch_size_t elen, switch_size_
 	*newlen = strlen(ebuf);
 
 	return ebuf;
-
 }
 
 static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, int rlevel)
@@ -1203,7 +1199,6 @@ static int preprocess(const char *cwd, const char *file, int write_fd, int rleve
 		if(write(write_fd, bp, (unsigned) cur) != (int) cur) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n");
 		}
-
 	}
 
 	close(read_fd);
@@ -1277,7 +1272,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
 	return xml;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
 												  const char *tag_name,
 												  const char *key_name, const char *key_value, switch_xml_t * root, switch_xml_t * node,
@@ -1373,7 +1367,6 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name
 	return status;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
 													   const char *user_name,
 													   const char *domain_name, 
@@ -1383,7 +1376,6 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
 													   switch_xml_t *user,
 													   switch_event_t *params)
 {
-
 	switch_status_t status;
 	*root = NULL;
 	*user = NULL;
@@ -1433,7 +1425,6 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
 	return SWITCH_STATUS_FALSE;
 }
 
-
 SWITCH_DECLARE(switch_xml_t) switch_xml_root(void)
 {
 	lock_count++;
@@ -1491,7 +1482,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **e
 	return errcnt == 0 ? switch_xml_root() : NULL;
 }
 
-
 SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err)
 {
 	switch_xml_t xml;
@@ -1539,7 +1529,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_x
 
 }
 
-
 // Encodes ampersand sequences appending the results to *dst, reallocating *dst
 // if length excedes max. a is non-zero for attribute encoding. Returns *dst
 static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, switch_size_t *dlen, switch_size_t *max, short a)