diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c
index a8af9e23e..b8678b9ad 100644
--- a/src/modules/conf_mouse/e_int_config_mouse.c
+++ b/src/modules/conf_mouse/e_int_config_mouse.c
@@ -2,10 +2,9 @@
 
 static void *_create_data(E_Config_Dialog *cfd);
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int  _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object  *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
-					   E_Config_Dialog_Data *cfdata);
-static int  _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 struct _E_Config_Dialog_Data
 {
@@ -93,7 +92,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
index 3a55ae68f..c62ca8c7a 100644
--- a/src/modules/conf_mouse/e_mod_main.c
+++ b/src/modules/conf_mouse/e_mod_main.c
@@ -14,8 +14,12 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, _("Mouse Settings"), NULL, "preferences-desktop-mouse", e_int_config_mouse);
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
+                                     NULL, "preferences-behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, 
+                                 _("Mouse Settings"), NULL, 
+                                 "preferences-desktop-mouse", 
+                                 e_int_config_mouse);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -25,7 +29,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;