diff --git a/epplets/E-Exec.c b/epplets/E-Exec.c
index 50357f4..9c9fb42 100644
--- a/epplets/E-Exec.c
+++ b/epplets/E-Exec.c
@@ -1,11 +1,7 @@
 #include "config.h"
 #include "epplet.h"
 
-#define EPPLET_NAME 	"E-Exec"
-#define EPPLET_VERSION 	"0.5"
-#define EPPLET_INFO	"Exec a command given by the user"
-
-#define MAX_HIST_LEN	50
+#define MAX_HIST_LEN    50
 
 #define TRUE 1
 #define FALSE 0
@@ -233,27 +229,19 @@ cb_configure(void *data __UNUSED__)
 int
 main(int argc, char *argv[])
 {
+    int             w;
+
+    w = 5;
     if ((argc > 1) && (!strcmp("--proper-size", argv[1])))
-    {
-        Epplet_Init(EPPLET_NAME, EPPLET_VERSION, EPPLET_INFO, 6, 3, argc, argv,
-                    0);
+        w = 6;
 
-        Epplet_gadget_show(Epplet_create_label(-10, 2, "E-Exec", 2));
+    Epplet_Init("E-Exec", "0.5", "Exec a command given by the user",
+                w, 3, argc, argv, 0);
 
-        textbox =
-            Epplet_create_textbox(NULL, NULL, 2, 32, 92, 14, 2, run_contents,
-                                  NULL);
-    }
-    else
-    {
-        Epplet_Init(EPPLET_NAME, EPPLET_VERSION, EPPLET_INFO, 5, 3, argc, argv,
-                    0);
-        Epplet_gadget_show(Epplet_create_label(-10, 2, "E-Exec", 2));
+    Epplet_gadget_show(Epplet_create_label(-10, 2, "E-Exec", 2));
 
-        textbox =
-            Epplet_create_textbox(NULL, NULL, 2, 32, 76, 14, 2, run_contents,
-                                  NULL);
-    }
+    textbox = Epplet_create_textbox(NULL, NULL, 2, 32, w * 16 - 4, 14,
+                                    2, run_contents, NULL);
 
     Epplet_load_config();