diff --git a/src/friendlist.c b/src/friendlist.c
index a68823f..b831959 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -17,8 +17,6 @@
 #include "friendlist.h"
 
 extern char *DATA_FILE;
-extern int store_data(Tox *m, char *path);
-
 extern ToxWindow *prompt;
 
 typedef struct {
@@ -136,9 +134,10 @@ static void select_friend(Tox *m, wint_t key)
     } else return;    /* Bad key input */
 
     /* If we reach this something is wrong */
+    fprintf(stderr, "select_friend() failed. Aborting...\n");
     endwin();
     tox_kill(m);
-    exit(2);
+    exit(EXIT_FAILURE);
 }
 
 static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
diff --git a/src/main.c b/src/main.c
index beef19b..11bc1c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,9 +60,9 @@ static void init_term()
     signal(SIGWINCH, on_window_resize);
 #if HAVE_WIDECHAR
     if (setlocale(LC_ALL, "") == NULL) {
-        printf("Could not set your locale, plese check your locale settings or"
+        fprintf(stderr, "Could not set your locale, plese check your locale settings or"
                "disable wide char support\n");
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 #endif
     initscr();
@@ -91,7 +91,7 @@ static Tox *init_tox()
 {
     /* Init core */
     Tox *m = tox_new();
-    if (!m)
+    if (m == NULL)
         return NULL;
 
     /* Callbacks */
@@ -184,7 +184,7 @@ int init_connection(Tox *m)
 
     fp = fopen(SRVLIST_FILE, "r");
 
-    if (!fp)
+    if (fp == NULL)
         return 1;
 
     char servers[MAXSERVERS][MAXLINE];
@@ -208,7 +208,7 @@ int init_connection(Tox *m)
     char *port = strtok(NULL, " ");
     char *key = strtok(NULL, " ");
 
-    if (!ip || !port || !key)
+    if (ip == NULL || port == NULL || key == NULL)
         return 3;
 
     tox_IP_Port dht;
@@ -320,7 +320,7 @@ static void load_data(Tox *m, char *path)
             fprintf(stderr, "malloc() failed.\n");
             fclose(fd);
             endwin();
-            exit(1);
+            exit(EXIT_FAILURE);
         }
 
         if (fread(buf, len, 1, fd) != 1) {
@@ -328,7 +328,7 @@ static void load_data(Tox *m, char *path)
             free(buf);
             fclose(fd);
             endwin();
-            exit(1);
+            exit(EXIT_FAILURE);
         }
 
         tox_load(m, buf, len);
@@ -349,7 +349,7 @@ static void load_data(Tox *m, char *path)
         if ((st = store_data(m, path)) != 0) {
             fprintf(stderr, "Store messenger failed with return code: %d\n", st);
             endwin();
-            exit(1);
+            exit(EXIT_FAILURE);
         }
     }
 }
@@ -405,10 +405,11 @@ int main(int argc, char *argv[])
 
     init_term();
     Tox *m = init_tox();
-    if (!m) {
+
+    if (m == NULL) {
         endwin();
         fprintf(stderr, "Failed to initialize network. Aborting...\n");
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     prompt = init_windows(m);
diff --git a/src/prompt.c b/src/prompt.c
index bd26010..3fa10d6 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -10,11 +10,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "toxic_windows.h"
 #include "prompt.h"
 
 extern char *DATA_FILE;
-extern int store_data(Tox *m, char *path);
 
 uint8_t pending_requests[MAX_STR_SIZE][TOX_CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests = 0; // XXX
@@ -298,7 +296,7 @@ void cmd_quit(ToxWindow *self, Tox *m, int argc, char **argv)
     store_data(m, DATA_FILE);
     free(DATA_FILE);
     tox_kill(m);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 void cmd_help(ToxWindow *self, Tox *m, int argc, char **argv)
diff --git a/src/prompt.h b/src/prompt.h
index 9c68831..c4d51df 100644
--- a/src/prompt.h
+++ b/src/prompt.h
@@ -9,5 +9,3 @@ unsigned char *hex_string_to_bin(char hex_string[]);
 void prompt_init_statusbar(ToxWindow *self, Tox *m);
 
 #endif /* end of include guard: PROMPT_H_UZYGWFFL */
-
-
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index 12e83bf..41f6b14 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -21,6 +21,9 @@
 #define N_DEFAULT_WINS 3
 
 #define UNKNOWN_NAME "Unknown"
+
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
  
 #ifndef TOXICVER
 #define TOXICVER "NOVER" //Use the -D flag to set this
@@ -85,4 +88,3 @@ int add_window(Tox *m, ToxWindow w);
 void del_window(ToxWindow *w);
 void set_active_window(int ch);
 #endif
-
diff --git a/src/windows.c b/src/windows.c
index f24e892..e0583c4 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -10,7 +10,6 @@
 #include "toxic_windows.h"
 
 extern char *DATA_FILE;
-extern int store_data(Tox *m, char *path);
 
 static ToxWindow windows[MAX_WINDOWS_NUM];
 static ToxWindow *active_window;
@@ -177,7 +176,8 @@ void set_next_window(int ch)
 
         if (active_window == inf) {    // infinite loop check
             endwin();
-            exit(2);
+            fprintf(stderr, "set_next_window() failed. Aborting...\n");
+            exit(EXIT_FAILURE);
         }
     }
 }
@@ -195,9 +195,9 @@ ToxWindow *init_windows()
     int n_prompt = add_window(m, new_prompt());
 
     if (n_prompt == -1 || add_window(m, new_friendlist()) == -1) {
-        fprintf(stderr, "add_window() failed.\n");
+        fprintf(stderr, "add_window() failed. Aborting...\n");
         endwin();
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     prompt = &windows[n_prompt];