diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
index 3f25f8edb..45442b41d 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -308,23 +308,18 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
 
    fdev = e_config->wallpaper_import_last_dev;
    snprintf(buf, sizeof(buf), "%s%s",fdev,e_config->wallpaper_import_last_path);
-    
+
    if(!ecore_file_exists(ecore_file_realpath(buf)))
-   {
-      fpath = "/";
-   }
+     fpath = "/";
    else
-   {
-      fpath = e_config->wallpaper_import_last_path;
-   }
-     
-   
+     fpath = e_config->wallpaper_import_last_path;
+
    if ((!fdev) && (!fpath))
      {
 	fdev = "~/";
 	fpath = "/";
      }
-     
+
    ofm = e_widget_fsel_add(evas, fdev, fpath, NULL, NULL, NULL, NULL,
 			   NULL, NULL, 1);
    e_widget_fsel_window_object_set(ofm, E_OBJECT(win));
@@ -336,7 +331,6 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
    edje_object_part_swallow(fsel->bg_obj, "e.swallow.content", o);
    evas_object_show(o);
 
-
    fsel->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
 					_fsel_cb_ok, win, NULL);
    e_widget_list_object_append(fsel->box_obj, fsel->ok_obj, 1, 0, 0.5);
@@ -352,7 +346,6 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(fsel->bg_obj, "e.swallow.buttons", o);
 
-
    edje_object_size_min_calc(fsel->bg_obj, &w, &h);
    evas_object_resize(fsel->bg_obj, w, h);
    e_win_resize(win, w, h);
@@ -628,10 +621,8 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
    e_int_config_wallpaper_import_del(import->win);
    if (fsel)
      {
-	if (r && fsel->parent)
-	  {
-	     e_int_config_wallpaper_update(fsel->parent, fdest);
-	  }
+	if ((r) && (fsel->parent))
+          e_int_config_wallpaper_update(fsel->parent, fdest);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }
    else
@@ -731,7 +722,7 @@ _import_cb_ok(void *data, void *data2)
    e_int_config_wallpaper_import_del(win);
    if (fsel)
      {
-	if (r && fsel->parent)
+	if ((r) && (fsel->parent))
 	  e_int_config_wallpaper_update(fsel->parent, buf);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }
@@ -793,20 +784,18 @@ _fsel_cb_ok(void *data, void *data2)
 	file = ecore_file_file_get(path);
 	e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s", file);
 
-	is_bg = edje_file_group_exists(path,
-	      "e/desktop/background");
+	is_bg = edje_file_group_exists(path, "e/desktop/background");
 	is_theme =
-	   edje_file_group_exists(path,
-		 "e/widgets/border/default/border");
+          edje_file_group_exists(path, "e/widgets/border/default/border");
 
 	if ((is_bg) && (!is_theme))
 	  {
 	     if (!ecore_file_cp(path, buf))
 	       {
 		  e_util_dialog_show(_("Wallpaper Import Error"),
-			_("Enlightenment was unable to "
-			   "import the wallpaper<br>due to a "
-			   "copy error."));
+                                     _("Enlightenment was unable to "
+                                       "import the wallpaper<br>due to a "
+                                       "copy error."));
 	       }
 	     else
 	       r = 1;
@@ -814,13 +803,13 @@ _fsel_cb_ok(void *data, void *data2)
 	else
 	  {
 	     e_util_dialog_show(_("Wallpaper Import Error"),
-		   _("Enlightenment was unable to "
-		      "import the wallpaper.<br><br>"
-		      "Are you sure this is a valid "
-		      "wallpaper?"));
+                                _("Enlightenment was unable to "
+                                  "import the wallpaper.<br><br>"
+                                  "Are you sure this is a valid "
+                                  "wallpaper?"));
 	  }
 
-	if (r && fsel->parent)
+	if ((r) && (fsel->parent))
 	  e_int_config_wallpaper_update(fsel->parent, buf);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }