diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 9b58a88fd..24408f628 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -127,8 +127,7 @@ e_configure_show(E_Container *con)
    eco->edje = edje_object_add(eco->evas);
    e_theme_edje_object_set(eco->edje, "base/theme/configure", 
 			   "e/widgets/configure/main");
-   edje_object_part_text_set(eco->edje, "e.text.title", 
-			   _("Settings"));
+   edje_object_part_text_set(eco->edje, "e.text.title", _("Settings"));
 
    eco->o_list = e_widget_list_add(eco->evas, 0, 0);
    edje_object_part_swallow(eco->edje, "e.swallow.content", eco->o_list);
@@ -209,11 +208,8 @@ e_configure_show(E_Container *con)
 EAPI void 
 e_configure_del(void) 
 {
-   if (_e_configure) 
-     {
-	e_object_del(E_OBJECT(_e_configure));
-	_e_configure = NULL;
-     }
+   if (_e_configure) e_object_del(E_OBJECT(_e_configure));
+   _e_configure = NULL;
 }
 
 static void 
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index d147b88aa..c7107b80f 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -26,8 +26,7 @@ static void _cb_button_click(void *data, void *data2);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
-   GADCON_CLIENT_CLASS_VERSION,
-     "configuration",
+   GADCON_CLIENT_CLASS_VERSION, "configuration",
      {
         _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, 
         e_gadcon_site_is_not_toolbar
@@ -86,8 +85,8 @@ static Evas_Object *
 _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
 {
    Evas_Object *o;
-   char buf[4096];
-   
+   char buf[PATH_MAX];
+
    o = edje_object_add(evas);
    snprintf(buf, sizeof(buf), "%s/e-module-conf.edj",
             e_module_dir_get(conf_module));
@@ -111,7 +110,7 @@ _cb_button_click(void *data, void *data2)
 }
 
 /* module setup */
-EAPI E_Module_Api e_modapi ={ E_MODULE_API_VERSION, "Conf" };
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Conf" };
 
 EAPI void *
 e_modapi_init(E_Module *m)
@@ -122,8 +121,8 @@ e_modapi_init(E_Module *m)
    if (act)
      {
 	act->func.go = _e_mod_action_conf_cb;
-	e_action_predef_name_set(_("Launch"), _("Settings Panel"), "configuration",
-				 NULL, NULL, 0);
+	e_action_predef_name_set(_("Launch"), _("Settings Panel"), 
+                                 "configuration", NULL, NULL, 0);
      }
    maug = 
      e_int_menus_menu_augmentation_add_sorted("config/0", _("Settings Panel"), 
@@ -246,7 +245,7 @@ static void
 _e_mod_menu_add(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
-   
+
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Settings Panel"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system");