23 files changed, 1959 insertions, 1655 deletions

diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index 7ebb72bf..42635b35 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -1,19 +1,19 @@
 /* DHT cryptosendfiletest
- * 
+ *
  * This program sends or receives a friend request.
- * 
+ *
  * it also sends the encrypted data from a file to another client.
  * Receives the file data that that client sends us.
- * 
+ *
  * NOTE: this program simulates 33% packet loss.
- * 
- * This is how I compile it: gcc -O2 -Wall -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/DHT.c ../nacl/build/$HOSTNAME/lib/amd64/* DHT_cryptosendfiletest.c 
  *
- * 
+ * This is how I compile it: gcc -O2 -Wall -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/DHT.c ../nacl/build/$HOSTNAME/lib/amd64/* DHT_cryptosendfiletest.c
+ *
+ *
  * Command line arguments are the ip and port of a node (for bootstrapping).
- * 
+ *
  * Saves all received data to: received.txt
- * 
+ *
  * EX: ./test 127.0.0.1 33445 filename.txt
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -32,9 +32,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 #include "../core/network.h"
 #include "../core/DHT.h"
 #include "../core/net_crypto.h"
@@ -58,7 +58,8 @@
 
 void printip(IP_Port ip_port)
 {
-    printf("\nIP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
+    printf("\nIP: %u.%u.%u.%u Port: %u\n", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3],
+           ntohs(ip_port.port));
 }
 
 uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
@@ -69,68 +70,81 @@ int main(int argc, char *argv[])
         printf("usage %s ip port filename(of file to send)\n", argv[0]);
         exit(0);
     }
+
     new_keys();
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++) {
-        if(self_public_key[i] < 16)
+
+    for (i = 0; i < 32; i++) {
+        if (self_public_key[i] < 16)
             printf("0");
-        printf("%hhX",self_public_key[i]);
+
+        printf("%hhX", self_public_key[i]);
     }
+
     printf("\n");
-    
+
     memcpy(self_client_id, self_public_key, 32);
-    
+
     char temp_id[128];
     printf("Enter the client_id of the friend to connect to (32 bytes HEX format):\n");
     scanf("%s", temp_id);
-    
+
     uint8_t friend_id[32];
     memcpy(friend_id, hex_string_to_bin(temp_id), 32);
-    
+
     /* memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32); */
-    
+
 
     DHT_addfriend(friend_id);
     IP_Port friend_ip;
     int connection = -1;
     int inconnection = -1;
-    
+
     uint8_t acceptedfriend_public_key[crypto_box_PUBLICKEYBYTES];
     int friendrequest = -1;
     uint8_t request_data[512];
-    
+
     /* initialize networking
      * bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
     initNetCrypto();
-    
+
     perror("Initialization");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
     DHT_bootstrap(bootstrap_ip_port);
-    
+
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
-    
+
     uint8_t buffer1[128];
     int read1 = 0;
     uint8_t buffer2[128];
     int read2 = 0;
     FILE *file1 = fopen(argv[3], "rb");
-    if ( file1==NULL ){printf("Error opening file.\n");return 1;}
+
+    if ( file1 == NULL ) {
+        printf("Error opening file.\n");
+        return 1;
+    }
+
     FILE *file2 = fopen("received.txt", "wb");
-    if ( file2==NULL ){return 1;}
+
+    if ( file2 == NULL ) {
+        return 1;
+    }
+
     read1 = fread(buffer1, 1, 128, file1);
-    
-    while(1) {
-        while(receivepacket(&ip_port, data, &length) != -1) {
-            if(rand() % 3 != 1) { /* simulate packet loss */
-                if(DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port)) {
+
+    while (1) {
+        while (receivepacket(&ip_port, data, &length) != -1) {
+            if (rand() % 3 != 1) { /* simulate packet loss */
+                if (DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port)) {
                     /* if packet is not recognized */
                     printf("Received unhandled packet with length: %u\n", length);
                 } else {
@@ -138,82 +152,98 @@ int main(int argc, char *argv[])
                 }
             }
         }
+
         friend_ip = DHT_getfriendip(friend_id);
-        if(friend_ip.ip.i != 0) {
-            if(connection == -1 && friendrequest == -1) {
+
+        if (friend_ip.ip.i != 0) {
+            if (connection == -1 && friendrequest == -1) {
                 printf("Sending friend request to peer:");
                 printip(friend_ip);
-                friendrequest = send_friendrequest(friend_id, friend_ip,(uint8_t *) "Hello World", 12);
+                friendrequest = send_friendrequest(friend_id, friend_ip, (uint8_t *) "Hello World", 12);
                 /* connection = crypto_connect((uint8_t *)friend_id, friend_ip); */
                 /* connection = new_connection(friend_ip); */
             }
-            if(check_friendrequest(friendrequest) == 1) {
+
+            if (check_friendrequest(friendrequest) == 1) {
                 printf("Started connecting to friend:");
                 connection = crypto_connect(friend_id, friend_ip);
             }
         }
-        if(inconnection == -1) {
+
+        if (inconnection == -1) {
             uint8_t secret_nonce[crypto_box_NONCEBYTES];
             uint8_t public_key[crypto_box_PUBLICKEYBYTES];
             uint8_t session_key[crypto_box_PUBLICKEYBYTES];
             inconnection = crypto_inbound(public_key, secret_nonce, session_key);
             inconnection = accept_crypto_inbound(inconnection, acceptedfriend_public_key, secret_nonce, session_key);
+
             /* inconnection = incoming_connection(); */
-            if(inconnection != -1) {
+            if (inconnection != -1) {
                 printf("Someone connected to us:\n");
-               /* printip(connection_ip(inconnection)); */
+                /* printip(connection_ip(inconnection)); */
             }
         }
-        if(handle_friendrequest(acceptedfriend_public_key, request_data) > 1) {
+
+        if (handle_friendrequest(acceptedfriend_public_key, request_data) > 1) {
             printf("RECEIVED FRIEND REQUEST: %s\n", request_data);
         }
 
         /* if someone connected to us write what he sends to a file
          * also send him our file. */
-        if(inconnection != -1) {
-            if(write_cryptpacket(inconnection, buffer1, read1)) {
+        if (inconnection != -1) {
+            if (write_cryptpacket(inconnection, buffer1, read1)) {
                 printf("Wrote data1.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
+
             read2 = read_cryptpacket(inconnection, buffer2);
-            if(read2 != 0) {
+
+            if (read2 != 0) {
                 printf("Received data1.\n");
-                if(!fwrite(buffer2, read2, 1, file2)) {
-                        printf("file write error1\n");
+
+                if (!fwrite(buffer2, read2, 1, file2)) {
+                    printf("file write error1\n");
                 }
-                if(read2 < 128) {
+
+                if (read2 < 128) {
                     printf("Closed file1 %u\n", read2);
                     fclose(file2);
                 }
             }
             /* if buffer is empty and the connection timed out. */
-            else if(is_cryptoconnected(inconnection) == 4) {
+            else if (is_cryptoconnected(inconnection) == 4) {
                 crypto_kill(inconnection);
             }
         }
+
         /* if we are connected to a friend send him data from the file.
          * also put what he sends us in a file. */
-        if(is_cryptoconnected(connection) >= 3)  {
-            if(write_cryptpacket(0, buffer1, read1)) {
+        if (is_cryptoconnected(connection) >= 3)  {
+            if (write_cryptpacket(0, buffer1, read1)) {
                 printf("Wrote data2.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
+
             read2 = read_cryptpacket(0, buffer2);
-            if(read2 != 0) {
+
+            if (read2 != 0) {
                 printf("Received data2.\n");
-                if(!fwrite(buffer2, read2, 1, file2)) {
-                        printf("file write error2\n");
+
+                if (!fwrite(buffer2, read2, 1, file2)) {
+                    printf("file write error2\n");
                 }
-                if(read2 < 128) {
+
+                if (read2 < 128) {
                     printf("Closed file2 %u\n", read2);
                     fclose(file2);
                 }
             }
             /* if buffer is empty and the connection timed out. */
-            else if(is_cryptoconnected(connection) == 4) {
+            else if (is_cryptoconnected(connection) == 4) {
                 crypto_kill(connection);
             }
         }
+
         doDHT();
         doLossless_UDP();
         doNetCrypto();
@@ -222,7 +252,7 @@ int main(int argc, char *argv[])
          *c_sleep(300); */
         c_sleep(1);
     }
-    
+
     shutdown_networking();
-    return 0;   
+    return 0;
 }
diff --git a/testing/DHT_sendfiletest.c b/testing/DHT_sendfiletest.c
index 873a73f8..f839be57 100644
--- a/testing/DHT_sendfiletest.c
+++ b/testing/DHT_sendfiletest.c
@@ -1,18 +1,18 @@
 /* DHT sendfiletest
- * 
+ *
  * Sends the data from a file to another client.
  * Receives the file data that that client sends us.
- * 
+ *
  * NOTE: this program simulates 33% packet loss.
- * 
+ *
  * Compile with: gcc -O2 -Wall -o test ../core/DHT.c ../core/network.c ../core/Lossless_UDP.c DHT_sendfiletest.c
- * 
- * Command line arguments are the ip and port of a node (for bootstrapping), the 
+ *
+ * Command line arguments are the ip and port of a node (for bootstrapping), the
  * client_id (32 bytes) of the friend you want to send the data in filename to and
  * the client_id this node will take.
- * 
+ *
  * Saves all received data to: received.txt
- * 
+ *
  * EX: ./test 127.0.0.1 33445 ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef filename.txt ABCDEFGHIJKLMNOPQRSTUVWXYZabcdeg
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -31,9 +31,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 #include "../core/network.h"
 #include "../core/DHT.h"
 #include "../core/Lossless_UDP.h"
@@ -56,56 +56,61 @@
 
 void printip(IP_Port ip_port)
 {
-    printf("\nIP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
+    printf("\nIP: %u.%u.%u.%u Port: %u\n", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3],
+           ntohs(ip_port.port));
 }
 
 int main(int argc, char *argv[])
 {
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
-    
+
     if (argc < 6) {
         printf("usage %s ip port client_id(of friend to find ip_port of) filename(of file to send) client_id(ours)\n", argv[0]);
         exit(0);
     }
+
     DHT_addfriend((uint8_t *)argv[3]);
     IP_Port friend_ip;
     int connection = -1;
     int inconnection = -1;
-    
+
     //initialize networking
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
-    
+
     memcpy(self_client_id, argv[5], 32);
-    
+
 
     perror("Initialization");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
     DHT_bootstrap(bootstrap_ip_port);
-    
+
     IP_Port ip_port;
     uint8_t data[MAX_UDP_PACKET_SIZE];
     uint32_t length;
-    
+
     uint8_t buffer1[128];
     int read1 = 0;
     uint8_t buffer2[128];
     int read2 = 0;
     FILE *file1 = fopen(argv[4], "rb");
+
     if (file1 == NULL) {
-      printf("Error opening file.\n");
-      return 1;
+        printf("Error opening file.\n");
+        return 1;
     }
+
     FILE *file2 = fopen("received.txt", "wb");
+
     if (file2 == NULL)
-      return 1;
-    
+        return 1;
+
     read1 = fread(buffer1, 1, 128, file1);
-    
+
     while (1) {
         while (receivepacket(&ip_port, data, &length) != -1) {
             if (rand() % 3 != 1) { /* simulate packet loss */
@@ -115,7 +120,9 @@ int main(int argc, char *argv[])
                     printf("Received handled packet with length: %u\n", length);
             }
         }
+
         friend_ip = DHT_getfriendip((uint8_t *)argv[3]);
+
         if (friend_ip.ip.i != 0) {
             if (connection == -1) {
                 printf("Started connecting to friend:");
@@ -123,13 +130,16 @@ int main(int argc, char *argv[])
                 connection = new_connection(friend_ip);
             }
         }
+
         if (inconnection == -1) {
             inconnection = incoming_connection();
+
             if (inconnection != -1) {
                 printf("Someone connected to us:");
                 printip(connection_ip(inconnection));
             }
         }
+
         /* if someone connected to us write what he sends to a file */
         /* also send him our file. */
         if (inconnection != -1) {
@@ -137,16 +147,21 @@ int main(int argc, char *argv[])
                 printf("Wrote data.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
+
             read2 = read_packet(inconnection, buffer2);
+
             if (read2 != 0) {
                 printf("Received data.\n");
+
                 if (!fwrite(buffer2, read2, 1, file2))
-                        printf("file write error\n");
+                    printf("file write error\n");
+
                 if (read2 < 128) {
                     fclose(file2);
                 }
-            } 
+            }
         }
+
         /* if we are connected to a friend send him data from the file.
          * also put what he sends us in a file. */
         if (is_connected(connection) == 3) {
@@ -154,15 +169,20 @@ int main(int argc, char *argv[])
                 printf("Wrote data.\n");
                 read1 = fread(buffer1, 1, 128, file1);
             }
+
             read2 = read_packet(0, buffer2);
+
             if (read2 != 0) {
                 printf("Received data.\n");
-                if(!fwrite(buffer2, read2, 1, file2))
-                   printf("file write error\n");
-                if(read2 < 128)
+
+                if (!fwrite(buffer2, read2, 1, file2))
+                    printf("file write error\n");
+
+                if (read2 < 128)
                     fclose(file2);
             }
         }
+
         doDHT();
         doLossless_UDP();
         /* print_clientlist();
@@ -170,7 +190,7 @@ int main(int argc, char *argv[])
          * c_sleep(300); */
         c_sleep(1);
     }
-    
+
     shutdown_networking();
-    return 0;   
+    return 0;
 }
\ No newline at end of file
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c5b367cf..3883f3a7 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -1,11 +1,11 @@
 /* DHT test
  * A file with a main that runs our DHT for testing.
- * 
+ *
  * Compile with: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_test.c
- * 
+ *
  * Command line arguments are the ip, port and public key of a node.
  * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- * 
+ *
  * The test will then ask you for the id (in hex format) of the friend you wish to add
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -24,9 +24,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 //#include "../core/network.h"
 #include "../core/DHT.c"
 #include "../core/friend_requests.c"
@@ -53,19 +53,22 @@ void print_clientlist()
     uint32_t i, j;
     IP_Port p_ip;
     printf("___________________CLOSE________________________________\n");
-    for(i = 0; i < 32; i++) {
+
+    for (i = 0; i < 32; i++) {
         printf("ClientID: ");
-        for(j = 0; j < 32; j++) {
+
+        for (j = 0; j < 32; j++) {
             printf("%02hhX", close_clientlist[i].client_id[j]);
         }
+
         p_ip = close_clientlist[i].ip_port;
-        printf("\nIP: %u.%u.%u.%u Port: %u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("\nTimestamp: %llu",(long long unsigned int) close_clientlist[i].timestamp);
-        printf("\nLast pinged: %llu\n",(long long unsigned int) close_clientlist[i].last_pinged);
+        printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+        printf("\nTimestamp: %llu", (long long unsigned int) close_clientlist[i].timestamp);
+        printf("\nLast pinged: %llu\n", (long long unsigned int) close_clientlist[i].last_pinged);
         p_ip = close_clientlist[i].ret_ip_port;
-        printf("OUR IP: %u.%u.%u.%u Port: %u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("Timestamp: %llu\n",(long long unsigned int) close_clientlist[i].ret_timestamp);
-    }  
+        printf("OUR IP: %u.%u.%u.%u Port: %u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+        printf("Timestamp: %llu\n", (long long unsigned int) close_clientlist[i].ret_timestamp);
+    }
 }
 
 void print_friendlist()
@@ -73,78 +76,91 @@ void print_friendlist()
     uint32_t i, j, k;
     IP_Port p_ip;
     printf("_________________FRIENDS__________________________________\n");
-    for(k = 0; k < num_friends; k++) {
+
+    for (k = 0; k < num_friends; k++) {
         printf("FRIEND %u\n", k);
         printf("ID: ");
-        for(j = 0; j < 32; j++) {
+
+        for (j = 0; j < 32; j++) {
             printf("%c", friends_list[k].client_id[j]);
         }
+
         p_ip = DHT_getfriendip(friends_list[k].client_id);
-        printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
+        printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
 
         printf("\nCLIENTS IN LIST:\n\n");
-        
-        for(i = 0; i < 4; i++) {
+
+        for (i = 0; i < 4; i++) {
             printf("ClientID: ");
-            for(j = 0; j < 32; j++) {
-                if(friends_list[k].client_list[i].client_id[j] < 16)
+
+            for (j = 0; j < 32; j++) {
+                if (friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
+
                 printf("%hhX", friends_list[k].client_list[i].client_id[j]);
             }
+
             p_ip = friends_list[k].client_list[i].ip_port;
-            printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("\nTimestamp: %llu",(long long unsigned int) friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %llu\n",(long long unsigned int) friends_list[k].client_list[i].last_pinged);
+            printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
+            printf("\nTimestamp: %llu", (long long unsigned int) friends_list[k].client_list[i].timestamp);
+            printf("\nLast pinged: %llu\n", (long long unsigned int) friends_list[k].client_list[i].last_pinged);
             p_ip = friends_list[k].client_list[i].ret_ip_port;
-            printf("ret IP: %u.%u.%u.%u:%u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
+            printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
             printf("Timestamp: %llu\n", (long long unsigned int)friends_list[k].client_list[i].ret_timestamp);
         }
     }
 }
 
-void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
+void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
 {
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
-    for(i = 0; i < length; i++) {
-        if(data[i] < 16)
+
+    for (i = 0; i < length; i++) {
+        if (data[i] < 16)
             printf("0");
-        printf("%hhX",data[i]);
+
+        printf("%hhX", data[i]);
     }
+
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
 int main(int argc, char *argv[])
 {
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
-    
+
     if (argc < 4) {
         printf("usage %s ip port public_key\n", argv[0]);
         exit(0);
     }
+
     new_keys();
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++) {
-        if(self_public_key[i] < 16)
+
+    for (i = 0; i < 32; i++) {
+        if (self_public_key[i] < 16)
             printf("0");
-        printf("%hhX",self_public_key[i]);
+
+        printf("%hhX", self_public_key[i]);
     }
-    
+
     char temp_id[128];
     printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
-    if(scanf("%s", temp_id) != 1)
+
+    if (scanf("%s", temp_id) != 1)
         exit(0);
-    
+
     DHT_addfriend(hex_string_to_bin(temp_id));
-    
+
     /* initialize networking */
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
-    
+
 
     perror("Initialization");
     IP_Port bootstrap_ip_port;
@@ -155,37 +171,37 @@ int main(int argc, char *argv[])
      * bootstrap_ip_port.ip.c[3] = 1; */
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
-    
-/*
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-*/
+
+    /*
+        IP_Port ip_port;
+        uint8_t data[MAX_UDP_PACKET_SIZE];
+        uint32_t length;
+    */
 
     DHT_init();
     friendreq_init();
-    
-    while(1) {
-            
+
+    while (1) {
+
         doDHT();
-        
-/* slvrTODO:
-        while(receivepacket(&ip_port, data, &length) != -1) {
-            if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
-                //unhandled packet
-                printpacket(data, length, ip_port);
-            } else {
-                printf("Received handled packet with length: %u\n", length);
-            }
-        }
-*/
+
+        /* slvrTODO:
+                while(receivepacket(&ip_port, data, &length) != -1) {
+                    if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
+                        //unhandled packet
+                        printpacket(data, length, ip_port);
+                    } else {
+                        printf("Received handled packet with length: %u\n", length);
+                    }
+                }
+        */
         networking_poll();
 
         print_clientlist();
         print_friendlist();
         c_sleep(300);
     }
-    
+
     shutdown_networking();
     return 0;
 }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 7efafa4f..575be2bd 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -1,11 +1,11 @@
 /* Lossless_UDP testclient
  * A program that connects and sends a file using our lossless UDP algorithm.
  * NOTE: this program simulates a 33% packet loss.
- * 
+ *
  * Best used in combination with Lossless_UDP_testserver
- * 
+ *
  * Compile with: gcc -O2 -Wall -lsodium -o testclient ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testclient.c
- * 
+ *
  * Command line arguments are the ip and port to connect and send the file to.
  * EX: ./testclient 127.0.0.1 33445 filename.txt
  *
@@ -25,7 +25,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 #include "../core/network.h"
@@ -49,17 +49,21 @@ void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
+
     for (i = 0; i < length; i++) {
         if (data[i] < 16)
             printf("0");
-        printf("%hhX",data[i]);
+
+        printf("%hhX", data[i]);
     }
+
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
 void printip(IP_Port ip_port)
 {
-    printf("\nIP: %u.%u.%u.%u Port: %u", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3], ntohs(ip_port.port));
+    printf("\nIP: %u.%u.%u.%u Port: %u", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3],
+           ntohs(ip_port.port));
 }
 /*
 void printpackets(Data test)
@@ -80,9 +84,9 @@ void printconnection(int connection_id)
     printf("--------------------BEGIN---------------------\n");
     IP_Port ip_port = connections[connection_id].ip_port;
     printf("IP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
-    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status, 
+    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status,
     connections[connection_id].inbound, connections[connection_id].SYNC_rate);
-    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate, 
+    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate,
     connections[connection_id].last_SYNC, connections[connection_id].last_sent, connections[connection_id].last_recv);
     int i;
     for(i =0; i < MAX_QUEUE_NUM; i++)
@@ -97,12 +101,12 @@ void printconnection(int connection_id)
     }
     Data sendbuffer[MAX_QUEUE_NUM];
     Data recvbuffer[MAX_QUEUE_NUM];
-    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n", 
-    connections[connection_id].recv_packetnum, 
+    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n",
+    connections[connection_id].recv_packetnum,
     connections[connection_id].orecv_packetnum, connections[connection_id].sent_packetnum, connections[connection_id].osent_packetnum,
     connections[connection_id].successful_sent,
     connections[connection_id].successful_read);
-    
+
     printf("req packets: \n");
     for(i = 0; i < BUFFER_PACKET_NUM; i++)
     {
@@ -112,7 +116,7 @@ void printconnection(int connection_id)
     connections[connection_id].recv_counter, connections[connection_id].send_counter);
 
     printf("--------------------END---------------------\n");
-    
+
 }
 */
 
@@ -120,26 +124,26 @@ void printconnection(int connection_id)
 /*run doLossless_UDP(); */
 void Lossless_UDP()
 {
-/*    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
-    printf("packet with length: %u\n", length); */
-        /* if(rand() % 3 != 1)//add packet loss
-         { */
-/*
-            if (LosslessUDP_handlepacket(data, length, ip_port))
-                printpacket(data, length, ip_port);
-            else 
-            printf("Received handled packet with length: %u\n", length); //printconnection(0); */
-            
-       /* } */
-        /* }*/
+    /*    IP_Port ip_port;
+        uint8_t data[MAX_UDP_PACKET_SIZE];
+        uint32_t length;
+        while (receivepacket(&ip_port, data, &length) != -1) {
+        printf("packet with length: %u\n", length); */
+    /* if(rand() % 3 != 1)//add packet loss
+     { */
+    /*
+                if (LosslessUDP_handlepacket(data, length, ip_port))
+                    printpacket(data, length, ip_port);
+                else
+                printf("Received handled packet with length: %u\n", length); //printconnection(0); */
+
+    /* } */
+    /* }*/
 
     networking_poll();
-    
-    doLossless_UDP();   
-    
+
+    doLossless_UDP();
+
 }
 
 int main(int argc, char *argv[])
@@ -148,15 +152,16 @@ int main(int argc, char *argv[])
         printf("usage: %s ip port filename\n", argv[0]);
         exit(0);
     }
-    
+
     uint8_t buffer[512];
     int read;
-    
+
     FILE *file = fopen(argv[3], "rb");
+
     if (file == NULL)
-      return 1;
-    
-    
+        return 1;
+
+
     /* initialize networking */
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
@@ -169,36 +174,43 @@ int main(int argc, char *argv[])
     printip(serverip);
     int connection = new_connection(serverip);
     uint64_t timer = current_time();
+
     while (1) {
-       /* printconnection(connection); */
+        /* printconnection(connection); */
         Lossless_UDP();
+
         if (is_connected(connection) == 3) {
             printf("Connecting took: %llu us\n", (unsigned long long)(current_time() - timer));
             break;
         }
+
         if (is_connected(connection) == 0) {
             printf("Connection timeout after: %llu us\n", (unsigned long long)(current_time() - timer));
             return 1;
         }
+
         c_sleep(1);
     }
+
     timer = current_time();
-    
+
     LosslessUDP_init();
-    
+
     /*read first part of file */
     read = fread(buffer, 1, 512, file);
-    
+
     while (1) {
         /* printconnection(connection); */
         Lossless_UDP();
+
         if (is_connected(connection) == 3) {
-            
+
             if (write_packet(connection, buffer, read)) {
-               /* printf("Wrote data.\n"); */
+                /* printf("Wrote data.\n"); */
                 read = fread(buffer, 1, 512, file);
 
             }
+
             /* printf("%u\n", sendqueue(connection)); */
             if (sendqueue(connection) == 0) {
                 if (read == 0) {
@@ -206,13 +218,13 @@ int main(int argc, char *argv[])
                     break;
                 }
             }
-        }
-        else {
+        } else {
             printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
             return 0;
         }
+
         /* c_sleep(1); */
     }
-        
+
     return 0;
 }
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index bc4fed7a..dec50d7f 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -1,11 +1,11 @@
 /* Lossless_UDP testserver
  * A program that waits for a lossless UDP connection and then saves all the data received to a file.
  * NOTE: this program simulates a 33% packet loss.
- * 
+ *
  * Best used in combination with Lossless_UDP_testclient
- * 
+ *
  * Compile with: gcc -O2 -Wall -lsodium -o testserver ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testserver.c
- * 
+ *
  * Command line argument is the name of the file to save what we receive to.
  * EX: ./testserver filename1.txt
  *
@@ -25,7 +25,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 #include "../core/network.h"
@@ -50,11 +50,14 @@ void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
+
     for (i = 0; i < length; i++) {
-        if(data[i] < 16)
+        if (data[i] < 16)
             printf("0");
-        printf("%hhX",data[i]);
+
+        printf("%hhX", data[i]);
     }
+
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
@@ -77,9 +80,9 @@ void printconnection(int connection_id)
     printf("--------------------BEGIN---------------------\n");
     IP_Port ip_port = connections[connection_id].ip_port;
     printf("IP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
-    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status, 
+    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status,
     connections[connection_id].inbound, connections[connection_id].SYNC_rate);
-    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate, 
+    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate,
     connections[connection_id].last_SYNC, connections[connection_id].last_sent, connections[connection_id].last_recv);
     int i;
     for(i =0; i < MAX_QUEUE_NUM; i++)
@@ -94,12 +97,12 @@ void printconnection(int connection_id)
     }
     Data sendbuffer[MAX_QUEUE_NUM];
     Data recvbuffer[MAX_QUEUE_NUM];
-    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n", 
-    connections[connection_id].recv_packetnum, 
+    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n",
+    connections[connection_id].recv_packetnum,
     connections[connection_id].orecv_packetnum, connections[connection_id].sent_packetnum, connections[connection_id].osent_packetnum,
     connections[connection_id].successful_sent,
     connections[connection_id].successful_read);
-    
+
     printf("req packets: \n");
     for(i = 0; i < BUFFER_PACKET_NUM; i++)
     {
@@ -109,7 +112,7 @@ void printconnection(int connection_id)
     connections[connection_id].recv_counter, connections[connection_id].send_counter);
 
     printf("--------------------END---------------------\n");
-    
+
 }
 */
 
@@ -121,20 +124,20 @@ void Lossless_UDP()
 //    uint8_t data[MAX_UDP_PACKET_SIZE];
 //    uint32_t length;
 //    while (receivepacket(&ip_port, data, &length) != -1) {
-        //if(rand() % 3 != 1)//add packet loss
-        //{
+    //if(rand() % 3 != 1)//add packet loss
+    //{
 //            if (LosslessUDP_handlepacket(data, length, ip_port)) {
 //                    printpacket(data, length, ip_port);
 //            } else {
-                //printconnection(0);
+    //printconnection(0);
 //                 printf("Received handled packet with length: %u\n", length);
 //            }
-        //}
+    //}
 //    }
 
     networking_poll();
-    
-    doLossless_UDP();   
+
+    doLossless_UDP();
 }
 
 
@@ -144,61 +147,69 @@ int main(int argc, char *argv[])
         printf("usage: %s filename\n", argv[0]);
         exit(0);
     }
-    
+
     uint8_t buffer[512];
     int read;
-    
+
     FILE *file = fopen(argv[1], "wb");
+
     if (file == NULL)
-      return 1;
-    
-    
+        return 1;
+
+
     //initialize networking
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
     init_networking(ip, PORT);
     perror("Initialization");
-    
+
     int connection;
     uint64_t timer = current_time();
-    
+
     LosslessUDP_init();
-    
+
     while (1) {
         Lossless_UDP();
         connection = incoming_connection();
-        if(connection != -1) {
-            if(is_connected(connection) == 2) {
+
+        if (connection != -1) {
+            if (is_connected(connection) == 2) {
                 printf("Received the connection.\n");
-                
+
             }
+
             break;
         }
+
         c_sleep(1);
     }
-    
+
     timer = current_time();
-    
+
     while (1) {
         //printconnection(0);
         Lossless_UDP();
+
         if (is_connected(connection) >= 2) {
             kill_connection_in(connection, 3000000);
             read = read_packet(connection, buffer);
+
             if (read != 0) {
-               // printf("Received data.\n");
-                if (!fwrite(buffer, read, 1, file)) 
-                        printf("file write error\n");
+                // printf("Received data.\n");
+                if (!fwrite(buffer, read, 1, file))
+                    printf("file write error\n");
             }
         }
-        if(is_connected(connection) == 4) {
+
+        if (is_connected(connection) == 4) {
             printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
             fclose(file);
             return 1;
         }
+
         c_sleep(1);
     }
-        
+
     return 0;
 }
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 2e2bedc3..f8685b39 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -55,35 +55,37 @@
  * networking_requesthandler and so cannot take a Messenger * */
 static Messenger *m;
 
-void print_request(uint8_t * public_key, uint8_t * data, uint16_t length, void* userdata)
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {
     printf("Friend request received from: \n");
     printf("ClientID: ");
     uint32_t j;
-    for(j = 0; j < 32; j++)
-    {
-        if(public_key[j] < 16)
+
+    for (j = 0; j < 32; j++) {
+        if (public_key[j] < 16)
             printf("0");
+
         printf("%hhX", public_key[j]);
     }
+
     printf("\nOf length: %u with data: %s \n", length, data);
 
-    if(length != sizeof("Install Gentoo"))
-    {
+    if (length != sizeof("Install Gentoo")) {
         return;
     }
-    if(memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0 )
-    //if the request contained the message of peace the person is obviously a friend so we add him.
+
+    if (memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0 )
+        //if the request contained the message of peace the person is obviously a friend so we add him.
     {
         printf("Friend request accepted.\n");
         m_addfriend_norequest(m, public_key);
     }
 }
 
-void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length, void* userdata)
+void print_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     printf("Message with length %u received from %u: %s \n", length, friendnumber, string);
-    m_sendmessage(m, friendnumber, (uint8_t*)"Test1", 6);
+    m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6);
 }
 
 int main(int argc, char *argv[])
@@ -94,19 +96,24 @@ int main(int argc, char *argv[])
     }
 
     m = initMessenger();
-    if( !m ){
+
+    if ( !m ) {
         fputs("Failed to allocate messenger datastructure\n", stderr);
         exit(0);
     }
 
-    if(argc > 3) {
+    if (argc > 3) {
         IP_Port bootstrap_ip_port;
         bootstrap_ip_port.port = htons(atoi(argv[2]));
         bootstrap_ip_port.ip.i = inet_addr(argv[1]);
         DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     } else {
         FILE *file = fopen(argv[1], "rb");
-        if ( file==NULL ){return 1;}
+
+        if ( file == NULL ) {
+            return 1;
+        }
+
         int read;
         uint8_t buffer[128000];
         read = fread(buffer, 1, 128000, file);
@@ -114,6 +121,7 @@ int main(int argc, char *argv[])
         fclose(file);
 
     }
+
     m_callback_friendrequest(m, print_request, NULL);
     m_callback_friendmessage(m, print_message, NULL);
 
@@ -121,39 +129,52 @@ int main(int argc, char *argv[])
     uint32_t i;
     uint8_t address[FRIEND_ADDRESS_SIZE];
     getaddress(m, address);
-    for(i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
-        if(address[i] < 16)
+
+    for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+        if (address[i] < 16)
             printf("0");
-        printf("%hhX",address[i]);
+
+        printf("%hhX", address[i]);
     }
 
     setname(m, (uint8_t *)"Anon", 5);
 
     char temp_id[128];
     printf("\nEnter the address of the friend you wish to add (38 bytes HEX format):\n");
-    if(scanf("%s", temp_id) != 1) {
+
+    if (scanf("%s", temp_id) != 1) {
         return 1;
     }
-    int num = m_addfriend(m, hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+
+    int num = m_addfriend(m, hex_string_to_bin(temp_id), (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
 
     perror("Initialization");
 
-    while(1) {
+    while (1) {
         uint8_t name[128];
         getname(m, num, name);
         printf("%s\n", name);
 
-        m_sendmessage(m, num, (uint8_t*)"Test", 5);
+        m_sendmessage(m, num, (uint8_t *)"Test", 5);
         doMessenger(m);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");
-        if ( file==NULL ){return 1;}
-        uint8_t * buffer = malloc(Messenger_size(m));
+
+        if ( file == NULL ) {
+            return 1;
+        }
+
+        uint8_t *buffer = malloc(Messenger_size(m));
         Messenger_save(m, buffer);
         size_t write_result = fwrite(buffer, 1, Messenger_size(m), file);
-        if (write_result < Messenger_size(m)) {return 1;}
+
+        if (write_result < Messenger_size(m)) {
+            return 1;
+        }
+
         free(buffer);
         fclose(file);
     }
+
     cleanupMessenger(m);
 }
diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c
index ba40722f..a61b30e8 100644
--- a/testing/crypto_speed_test.c
+++ b/testing/crypto_speed_test.c
@@ -10,7 +10,7 @@ double get_time()
     LARGE_INTEGER t, f;
     QueryPerformanceCounter(&t);
     QueryPerformanceFrequency(&f);
-    return (double)t.QuadPart/(double)f.QuadPart;
+    return (double)t.QuadPart / (double)f.QuadPart;
 }
 
 #else
@@ -23,7 +23,7 @@ double get_time()
     struct timeval t;
     struct timezone tzp;
     gettimeofday(&t, &tzp);
-    return t.tv_sec + t.tv_usec*1e-6;
+    return t.tv_sec + t.tv_usec * 1e-6;
 }
 
 #endif
@@ -35,16 +35,16 @@ double get_time()
 void rand_bytes(uint8_t *b, size_t blen)
 {
     size_t i;
-    for (i = 0; i < blen; i++)
-    {
+
+    for (i = 0; i < blen; i++) {
         b[i] = rand();
     }
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     const int numtrials = 10000;
- 
+
     unsigned char pk1[crypto_box_PUBLICKEYBYTES];
     unsigned char sk1[crypto_box_SECRETKEYBYTES];
     unsigned char pk2[crypto_box_PUBLICKEYBYTES];
@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
     unsigned char k1[crypto_box_BEFORENMBYTES];
     unsigned char k2[crypto_box_BEFORENMBYTES];
 
-    unsigned char n[crypto_box_NONCEBYTES];    
+    unsigned char n[crypto_box_NONCEBYTES];
 
     unsigned char m[500];
     unsigned char c[sizeof(m) + ENCRYPTION_PADDING];
@@ -78,46 +78,50 @@ int main(int argc, char* argv[])
 
     printf("starting slow...\n");
     starttime = get_time();
-    for (trialno = 0; trialno < numtrials; trialno++)
-    {
+
+    for (trialno = 0; trialno < numtrials; trialno++) {
         encrypt_data(pk1, sk2, n, m, sizeof(m), c);
         decrypt_data(pk2, sk1, n, c, sizeof(c), m);
     }
+
     endtime = get_time();
-    slow_time = endtime-starttime;
+    slow_time = endtime - starttime;
 
     printf("starting fast...\n");
     starttime = get_time();
-    for (trialno = 0; trialno < numtrials; trialno++)
-    {
+
+    for (trialno = 0; trialno < numtrials; trialno++) {
         encrypt_data_fast(k1, n, m, sizeof(m), c);
         decrypt_data_fast(k2, n, c, sizeof(c), m);
     }
+
     endtime = get_time();
-    fast_time = endtime-starttime;
+    fast_time = endtime - starttime;
 
     printf("starting keygen...\n");
     starttime = get_time();
-    for (trialno = 0; trialno < numtrials; trialno++)
-    {
+
+    for (trialno = 0; trialno < numtrials; trialno++) {
         crypto_box_keypair(pk1, sk1);
         crypto_box_keypair(pk2, sk2);
     }
+
     endtime = get_time();
-    keygen_time = endtime-starttime;
+    keygen_time = endtime - starttime;
 
     printf("starting precompute...\n");
     starttime = get_time();
-    for (trialno = 0; trialno < numtrials; trialno++)
-    {
+
+    for (trialno = 0; trialno < numtrials; trialno++) {
         encrypt_precompute(pk1, sk2, k);
         encrypt_precompute(pk2, sk1, k);
     }
+
     endtime = get_time();
-    precompute_time = endtime-starttime;
+    precompute_time = endtime - starttime;
 
     printf("\n");
-    printf("trials: %i\n", 2*numtrials);
+    printf("trials: %i\n", 2 * numtrials);
     printf("\n");
     printf("slow time: %f sec\n", slow_time);
     printf("fast time: %f sec\n", fast_time);
@@ -126,8 +130,8 @@ int main(int argc, char* argv[])
     printf("\n");
     printf("Speed boost: %.1f%%\n", slow_time * 100 / fast_time);
     printf("\n");
-    printf("slow: %.1f per second\n", 2*numtrials/slow_time);
-    printf("fast: %.1f per second\n", 2*numtrials/fast_time);
+    printf("slow: %.1f per second\n", 2 * numtrials / slow_time);
+    printf("fast: %.1f per second\n", 2 * numtrials / fast_time);
 
     return 0;
 }
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index f3d6b0ae..7268f3cb 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -1,5 +1,5 @@
 /* misc_tools.c
- * 
+ *
  * Miscellaneous functions and data structures for doing random things.
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -18,9 +18,9 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 #include "misc_tools.h"
 
 #include <string.h>
@@ -32,14 +32,15 @@
 #endif // DEBUG
 
 /* TODO: rewrite */
-unsigned char * hex_string_to_bin(char hex_string[])
+unsigned char *hex_string_to_bin(char hex_string[])
 {
     size_t len = strlen(hex_string);
     unsigned char *val = malloc(len);
     char *pos = hex_string;
     int i;
-    for(i = 0; i < len; ++i, pos+=2)
-        sscanf(pos,"%2hhx",&val[i]);
+
+    for (i = 0; i < len; ++i, pos += 2)
+        sscanf(pos, "%2hhx", &val[i]);
 
     return val;
 }
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index b8c90fa6..1379b31a 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -1,5 +1,5 @@
 /* misc_tools.h
- * 
+ *
  * Miscellaneous functions and data structures for doing random things.
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -18,51 +18,51 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
 #ifndef MISC_TOOLS_H
 #define MISC_TOOLS_H
 
 #include <stdlib.h>
 #include <stdint.h>
 
-unsigned char* hex_string_to_bin(char hex_string[]);
+unsigned char *hex_string_to_bin(char hex_string[]);
 
 /*********************Debugging Macros********************
  * wiki.tox.im/index.php/Internal_functions_and_data_structures#Debugging
  *********************************************************/
 #ifdef DEBUG
-    #include <assert.h>
-    #include <stdio.h>
-    #include <string.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
-    #define DEBUG_PRINT(str, ...) do { \
+#define DEBUG_PRINT(str, ...) do { \
         char msg[1000]; \
         sprintf(msg, "%s(): line %d (file %s): %s%%c\n", __FUNCTION__, __LINE__, __FILE__, str); \
         fprintf(stderr, msg, __VA_ARGS__); \
     } while (0)
 
-    #define WARNING(...) do { \
+#define WARNING(...) do { \
         fprintf(stderr, "warning in "); \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
     } while (0)
 
-    #define INFO(...) do { \
+#define INFO(...) do { \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
     } while (0)
-    
-        #undef ERROR
-    #define ERROR(exit_status, ...) do { \
+
+#undef ERROR
+#define ERROR(exit_status, ...) do { \
         fprintf(stderr, "error in "); \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
         exit(exit_status); \
     } while (0)
 #else
-    #define WARNING(...)
-    #define INFO(...)
-    #undef ERROR
-    #define ERROR(...)
+#define WARNING(...)
+#define INFO(...)
+#undef ERROR
+#define ERROR(...)
 #endif // DEBUG
 
 /************************Linked List***********************
@@ -81,31 +81,31 @@ unsigned char* hex_string_to_bin(char hex_string[]);
 #define TOX_LIST_GET_VALUE(tmp_name, name_in_parent, parent_type) GET_PARENT(tmp_name, name_in_parent, parent_type)
 
 typedef struct tox_list {
-   struct tox_list *prev, *next;
+    struct tox_list *prev, *next;
 } tox_list_t;
 
 /* Returns a new tox_list_t. */
-static inline void tox_list_new(tox_list_t* lst)
+static inline void tox_list_new(tox_list_t *lst)
 {
-   lst->prev = lst->next = lst;
+    lst->prev = lst->next = lst;
 }
-      
+
 /* Inserts a new tox_lst after lst and returns it. */
-static inline void tox_list_add(tox_list_t* lst, tox_list_t* new_lst)
+static inline void tox_list_add(tox_list_t *lst, tox_list_t *new_lst)
 {
-   tox_list_new(new_lst);
+    tox_list_new(new_lst);
 
-   new_lst->next = lst->next;
-   new_lst->next->prev = new_lst;
+    new_lst->next = lst->next;
+    new_lst->next->prev = new_lst;
 
-   lst->next = new_lst;
-   new_lst->prev = lst;
+    lst->next = new_lst;
+    new_lst->prev = lst;
 }
 
-static inline void tox_list_remove(tox_list_t* lst)
+static inline void tox_list_remove(tox_list_t *lst)
 {
-   lst->prev->next = lst->next;
-   lst->next->prev = lst->prev;
+    lst->prev->next = lst->next;
+    lst->next->prev = lst->prev;
 }
 
 /****************************Array***************************
@@ -124,7 +124,7 @@ static inline void tox_array_init(struct tox_array *arr)
 {
     arr->size = 1;
     arr->length = 0;
-    arr->data = malloc(sizeof(void*));
+    arr->data = malloc(sizeof(void *));
 }
 
 static inline void tox_array_delete(struct tox_array *arr)
@@ -139,22 +139,24 @@ static inline void tox_array_delete(struct tox_array *arr)
 static inline void tox_array_shrink_to_fit(struct tox_array *arr, int32_t extra)
 {
     arr->size = arr->length + extra;
-    arr->data = realloc(arr->data, arr->size * sizeof(void*));
+    arr->data = realloc(arr->data, arr->size * sizeof(void *));
 }
 
 static inline void _tox_array_push(struct tox_array *arr, void *new)
 {
-    if (arr->length+1 >= arr->size)
+    if (arr->length + 1 >= arr->size)
         tox_array_shrink_to_fit(arr, arr->size);
+
     arr->data[arr->length++] = new;
 }
 #define tox_array_push(arr, new) _tox_array_push(arr, (void*)new)
 
-static inline void* tox_array_pop(struct tox_array *arr)
+static inline void *tox_array_pop(struct tox_array *arr)
 {
-    if (arr->length-1 < arr->size/4)
-        tox_array_shrink_to_fit(arr, arr->length*2); 
-    return arr->data[arr->length--]; 
+    if (arr->length - 1 < arr->size / 4)
+        tox_array_shrink_to_fit(arr, arr->length * 2);
+
+    return arr->data[arr->length--];
 }
 
 #endif // MISC_TOOLS_H
diff --git a/testing/nTox.c b/testing/nTox.c
index ead4fd21..8813f305 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -57,17 +57,18 @@ void get_id(Messenger *m, char *data)
     int i = 0;
     uint8_t address[FRIEND_ADDRESS_SIZE];
     getaddress(m, address);
-    for(; i < FRIEND_ADDRESS_SIZE; i++)
-    {
-        sprintf(data + 2*i + offset, "%02X ", address[i]);
+
+    for (; i < FRIEND_ADDRESS_SIZE; i++) {
+        sprintf(data + 2 * i + offset, "%02X ", address[i]);
     }
 }
 
 void new_lines(char *line)
 {
     int i = 0;
-    for (i = HISTORY-1; i > 0; i--)
-        strncpy(lines[i], lines[i-1], STRING_LENGTH - 1);
+
+    for (i = HISTORY - 1; i > 0; i--)
+        strncpy(lines[i], lines[i - 1], STRING_LENGTH - 1);
 
     strncpy(lines[0], line, STRING_LENGTH - 1);
     do_refresh();
@@ -79,46 +80,52 @@ void print_friendlist(Messenger *m)
     char name[MAX_NAME_LENGTH];
     int i = 0;
     new_lines("[i] Friend List:");
-    while(getname(m, i, (uint8_t *)name) != -1) {
+
+    while (getname(m, i, (uint8_t *)name) != -1) {
         /* account for the longest name and the longest "base" string */
         char fstring[MAX_NAME_LENGTH + strlen("[i] Friend: NULL\n\tid: ")];
 
         if (strlen(name) <= 0) {
             sprintf(fstring, "[i] Friend: No Friend!\n\tid: %i", i);
         } else {
-            sprintf(fstring, "[i] Friend: %s\n\tid: %i", (uint8_t*)name, i);
+            sprintf(fstring, "[i] Friend: %s\n\tid: %i", (uint8_t *)name, i);
         }
+
         i++;
         new_lines(fstring);
     }
 
-    if(i == 0)
+    if (i == 0)
         new_lines("\tno friends! D:");
 }
 
 char *format_message(Messenger *m, char *message, int friendnum)
 {
     char name[MAX_NAME_LENGTH];
+
     if (friendnum != -1) {
-            getname(m, friendnum, (uint8_t*)name);
+        getname(m, friendnum, (uint8_t *)name);
     } else {
-            getself_name(m, (uint8_t*)name, sizeof(name));
+        getself_name(m, (uint8_t *)name, sizeof(name));
     }
-    char *msg = malloc(100+strlen(message)+strlen(name)+1);
+
+    char *msg = malloc(100 + strlen(message) + strlen(name) + 1);
 
     time_t rawtime;
-    struct tm * timeinfo;
+    struct tm *timeinfo;
     time ( &rawtime );
     timeinfo = localtime ( &rawtime );
-    char* time = asctime(timeinfo);
+    char *time = asctime(timeinfo);
     size_t len = strlen(time);
-    time[len-1] = '\0';
+    time[len - 1] = '\0';
+
     if (friendnum != -1) {
         sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message);
     } else {
         // This message came from ourselves
         sprintf(msg, "%s <%s> %s", time, name, message);
     }
+
     return msg;
 }
 
@@ -126,110 +133,127 @@ void line_eval(Messenger *m, char *line)
 {
     if (line[0] == '/') {
         char inpt_command = line[1];
-        char prompt[STRING_LENGTH+2] = "> ";
+        char prompt[STRING_LENGTH + 2] = "> ";
         int prompt_offset = 3;
         strcat(prompt, line);
         new_lines(prompt);
+
         if (inpt_command == 'f') { // add friend command: /f ID
             int i;
             char temp_id[128];
+
             for (i = 0; i < 128; i++)
-                temp_id[i] = line[i+prompt_offset];
+                temp_id[i] = line[i + prompt_offset];
 
             unsigned char *bin_string = hex_string_to_bin(temp_id);
-            int num = m_addfriend(m, bin_string, (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+            int num = m_addfriend(m, bin_string, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
             free(bin_string);
             char numstring[100];
+
             switch (num) {
-            case FAERR_TOOLONG:
-                sprintf(numstring, "[i] Message is too long.");
-                break;
-            case FAERR_NOMESSAGE:
-                sprintf(numstring, "[i] Please add a message to your request.");
-                break;
-            case FAERR_OWNKEY:
-                sprintf(numstring, "[i] That appears to be your own ID.");
-                break;
-            case FAERR_ALREADYSENT:
-                sprintf(numstring, "[i] Friend request already sent.");
-                break;
-            case FAERR_UNKNOWN:
-                sprintf(numstring, "[i] Undefined error when adding friend.");
-                break;
-            default:
-                sprintf(numstring, "[i] Added friend as %d.", num);
-                break;
+                case FAERR_TOOLONG:
+                    sprintf(numstring, "[i] Message is too long.");
+                    break;
+
+                case FAERR_NOMESSAGE:
+                    sprintf(numstring, "[i] Please add a message to your request.");
+                    break;
+
+                case FAERR_OWNKEY:
+                    sprintf(numstring, "[i] That appears to be your own ID.");
+                    break;
+
+                case FAERR_ALREADYSENT:
+                    sprintf(numstring, "[i] Friend request already sent.");
+                    break;
+
+                case FAERR_UNKNOWN:
+                    sprintf(numstring, "[i] Undefined error when adding friend.");
+                    break;
+
+                default:
+                    sprintf(numstring, "[i] Added friend as %d.", num);
+                    break;
             }
+
             new_lines(numstring);
             do_refresh();
-        }
-        else if (inpt_command == 'd') {
+        } else if (inpt_command == 'd') {
             doMessenger(m);
-        }
-        else if (inpt_command == 'm') { //message command: /m friendnumber messsage
+        } else if (inpt_command == 'm') { //message command: /m friendnumber messsage
             size_t len = strlen(line);
-            if(len < 3)
+
+            if (len < 3)
                 return;
 
-            char numstring[len-3];
-            char message[len-3];
+            char numstring[len - 3];
+            char message[len - 3];
             int i;
+
             for (i = 0; i < len; i++) {
-                if (line[i+3] != ' ') {
-                    numstring[i] = line[i+3];
+                if (line[i + 3] != ' ') {
+                    numstring[i] = line[i + 3];
                 } else {
                     int j;
-                    for (j = (i+1); j < (len+1); j++)
-                        message[j-i-1] = line[j+3];
+
+                    for (j = (i + 1); j < (len + 1); j++)
+                        message[j - i - 1] = line[j + 3];
+
                     break;
                 }
             }
+
             int num = atoi(numstring);
-            if (m_sendmessage(m, num, (uint8_t*) message, strlen(message) + 1) != 1) {
+
+            if (m_sendmessage(m, num, (uint8_t *) message, strlen(message) + 1) != 1) {
                 new_lines("[i] could not send message");
             } else {
                 new_lines(format_message(m, message, -1));
             }
-        }
-        else if (inpt_command == 'n') {
+        } else if (inpt_command == 'n') {
             uint8_t name[MAX_NAME_LENGTH];
             int i = 0;
             size_t len = strlen(line);
+
             for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                name[i-3] = line[i];
+
+                name[i - 3] = line[i];
             }
-            name[i-3] = 0;
+
+            name[i - 3] = 0;
             setname(m, name, i - 2);
             char numstring[100];
-            sprintf(numstring, "[i] changed nick to %s", (char*)name);
+            sprintf(numstring, "[i] changed nick to %s", (char *)name);
             new_lines(numstring);
-        }
-        else if (inpt_command == 'l') {
+        } else if (inpt_command == 'l') {
             print_friendlist(m);
-        }
-        else if (inpt_command == 's') {
+        } else if (inpt_command == 's') {
             uint8_t status[MAX_STATUSMESSAGE_LENGTH];
             int i = 0;
             size_t len = strlen(line);
+
             for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                status[i-3] = line[i];
+
+                status[i - 3] = line[i];
             }
-            status[i-3] = 0;
-            m_set_statusmessage(m, status, strlen((char*)status) + 1);
+
+            status[i - 3] = 0;
+            m_set_statusmessage(m, status, strlen((char *)status) + 1);
             char numstring[100];
-            sprintf(numstring, "[i] changed status to %s", (char*)status);
+            sprintf(numstring, "[i] changed status to %s", (char *)status);
             new_lines(numstring);
-        }
-        else if (inpt_command == 'a') {
+        } else if (inpt_command == 'a') {
             uint8_t numf = atoi(line + 3);
             char numchar[100];
+
             if (numf >= num_requests || pending_requests[numf].accepted) {
-                sprintf(numchar,"[i] you either didn't receive that request or you already accepted it");
+                sprintf(numchar, "[i] you either didn't receive that request or you already accepted it");
                 new_lines(numchar);
             } else {
                 int num = m_addfriend_norequest(m, pending_requests[numf].id);
+
                 if (num != -1) {
                     pending_requests[numf].accepted = 1;
                     sprintf(numchar, "[i] friend request %u accepted", numf);
@@ -241,16 +265,15 @@ void line_eval(Messenger *m, char *line)
                     new_lines(numchar);
                 }
             }
+
             do_refresh();
+        } else if (inpt_command == 'h') { //help
+            new_lines(help);
+        } else if (inpt_command == 'i') { //info
+            char idstring[200];
+            get_id(m, idstring);
+            new_lines(idstring);
         }
-       else if (inpt_command == 'h') { //help
-           new_lines(help);
-        }
-       else if (inpt_command == 'i') { //info
-           char idstring[200];
-           get_id(m, idstring);
-           new_lines(idstring);
-       }
 
         else if (inpt_command == 'q') { //exit
             endwin();
@@ -266,13 +289,15 @@ void line_eval(Messenger *m, char *line)
 
 void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width)
 {
-    strcpy(output,input);
+    strcpy(output, input);
     size_t len = strlen(output);
     int i = 0;
+
     for (i = line_width; i < len; i = i + line_width) {
         while (output[i] != ' ' && i != 0) {
             i--;
         }
+
         if (i > 0) {
             output[i] = '\n';
         }
@@ -284,40 +309,47 @@ int count_lines(char *string)
     size_t len = strlen(string);
     int count = 1;
     int i;
+
     for (i = 0; i < len; i++) {
         if (string[i] == '\n')
             count++;
     }
+
     return count;
 }
 
 char *appender(char *str, const char c)
 {
     size_t len = strlen(str);
+
     if (len < STRING_LENGTH) {
-        str[len+1] = str[len];
+        str[len + 1] = str[len];
         str[len] = c;
     }
+
     return str;
 }
 
 void do_refresh()
 {
-    int count=0;
+    int count = 0;
     char wrap_output[STRING_LENGTH];
     int L;
     int i;
+
     for (i = 0; i < HISTORY; i++) {
         wrap(wrap_output, lines[i], x);
         L = count_lines(wrap_output);
         count = count + L;
+
         if (count < y) {
-            move(y-1-count, 0);
+            move(y - 1 - count, 0);
             printw(wrap_output);
             clrtoeol();
         }
     }
-    move(y-1, 0);
+
+    move(y - 1, 0);
     clrtoeol();
     printw(">> ");
     printw(line);
@@ -325,7 +357,7 @@ void do_refresh()
     refresh();
 }
 
-void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {
     new_lines("[i] received friend request with message:");
     new_lines((char *)data);
@@ -338,26 +370,28 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* us
     do_refresh();
 }
 
-void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length, void* userdata)
+void print_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
-    new_lines(format_message(m, (char*)string, friendnumber));
+    new_lines(format_message(m, (char *)string, friendnumber));
 }
 
-void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    if(getname(m, friendnumber, (uint8_t*)name) != -1) {
-        char msg[100+length];
+
+    if (getname(m, friendnumber, (uint8_t *)name) != -1) {
+        char msg[100 + length];
         sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string);
         new_lines(msg);
     }
 }
 
-void print_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void print_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    if(getname(m, friendnumber, (uint8_t*)name) != -1) {
-        char msg[100+length+strlen(name)+1];
+
+    if (getname(m, friendnumber, (uint8_t *)name) != -1) {
+        char msg[100 + length + strlen(name) + 1];
         sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string);
         new_lines(msg);
     }
@@ -375,10 +409,12 @@ void load_key(Messenger *m, char *path)
         rewind(data_file);
 
         uint8_t data[size];
-        if (fread(data, sizeof(uint8_t), size, data_file) != size){
+
+        if (fread(data, sizeof(uint8_t), size, data_file) != size) {
             fputs("[!] could not read data file! exiting...\n", stderr);
             goto FILE_ERROR;
         }
+
         Messenger_load(m, data, size);
 
     } else {
@@ -388,24 +424,27 @@ void load_key(Messenger *m, char *path)
         Messenger_save(m, data);
         data_file = fopen(path, "w");
 
-        if(!data_file) {
+        if (!data_file) {
             perror("[!] load_key");
             exit(1);
         }
 
-        if (fwrite(data, sizeof(uint8_t), size, data_file) != size){
+        if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
             fputs("[!] could not write data file! exiting...", stderr);
             goto FILE_ERROR;
         }
     }
 
-    if(fclose(data_file) < 0)
+    if (fclose(data_file) < 0)
         perror("[!] fclose failed");
+
     return;
 
 FILE_ERROR:
-    if(fclose(data_file) < 0)
+
+    if (fclose(data_file) < 0)
         perror("[!] fclose failed");
+
     exit(1);
 }
 
@@ -431,15 +470,15 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
-    for(i = 0; i < argc; i++) {
-      if (argv[i] == NULL){
-        break;
-      } else if(argv[i][0] == '-') {
-            if(argv[i][1] == 'h') {
+    for (i = 0; i < argc; i++) {
+        if (argv[i] == NULL) {
+            break;
+        } else if (argv[i][0] == '-') {
+            if (argv[i][1] == 'h') {
                 print_help();
                 exit(0);
-            } else if(argv[i][1] == 'f') {
-                if(argv[i + 1] != NULL)
+            } else if (argv[i][1] == 'f') {
+                if (argv[i + 1] != NULL)
                     filename = argv[i + 1];
                 else {
                     fputs("[!] you passed '-f' without giving an argument!\n", stderr);
@@ -449,7 +488,8 @@ int main(int argc, char *argv[])
     }
 
     m = initMessenger();
-    if( !m ){
+
+    if ( !m ) {
         fputs("Failed to allocate Messenger datastructure", stderr);
         exit(0);
     }
@@ -474,6 +514,7 @@ int main(int argc, char *argv[])
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
+
     if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else
@@ -483,7 +524,8 @@ int main(int argc, char *argv[])
     DHT_bootstrap(bootstrap_ip_port, binary_string);
     free(binary_string);
     nodelay(stdscr, TRUE);
-    while(true) {
+
+    while (true) {
         if (on == 0 && DHT_isconnected()) {
             new_lines("[i] connected to DHT\n[i] define username with /n");
             on = 1;
@@ -494,19 +536,22 @@ int main(int argc, char *argv[])
         do_refresh();
 
         c = getch();
+
         if (c == ERR || c == 27)
             continue;
 
         getmaxyx(stdscr, y, x);
+
         if (c == '\n') {
             line_eval(m, line);
             strcpy(line, "");
         } else if (c == 8 || c == 127) {
-            line[strlen(line)-1] = '\0';
+            line[strlen(line) - 1] = '\0';
         } else if (isalnum(c) || ispunct(c) || c == ' ') {
             strcpy(line, appender(line, (char) c));
         }
     }
+
     cleanupMessenger(m);
     endwin();
     return 0;
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 7739c0a6..c26d9d16 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -54,7 +54,7 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *us
 {
     friend_request_received = 1;
     printf("\n\n[i] received friend request with message\n");
-    printf("'%s'",(char *)data);
+    printf("'%s'", (char *)data);
     char numchar[100];
     sprintf(numchar, "\n[i] accept request with /a %u\n\n", num_requests);
     printf(numchar);
@@ -63,18 +63,18 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *us
     ++num_requests;
 }
 
-void print_message(Messenger *messenger, int friendnumber, uint8_t * string, uint16_t length, void *userdata)
+void print_message(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(messenger, friendnumber, (uint8_t*)name);
-    char msg[100+length+strlen(name)+1];
+    getname(messenger, friendnumber, (uint8_t *)name);
+    char msg[100 + length + strlen(name) + 1];
     time_t rawtime;
-    struct tm * timeinfo;
+    struct tm *timeinfo;
     time (&rawtime);
     timeinfo = localtime (&rawtime);
-    char* temp = asctime(timeinfo);
+    char *temp = asctime(timeinfo);
     size_t len = strlen(temp);
-    temp[len-1]='\0';
+    temp[len - 1] = '\0';
     sprintf(msg, "\n[%d] %s <%s> %s\n\n", friendnumber, temp, name, string); // timestamp
     printf(msg);
 }
@@ -82,8 +82,8 @@ void print_message(Messenger *messenger, int friendnumber, uint8_t * string, uin
 void print_nickchange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(messenger, friendnumber, (uint8_t*)name);
-    char msg[100+length];
+    getname(messenger, friendnumber, (uint8_t *)name);
+    char msg[100 + length];
     sprintf(msg, "\n\n[i] [%d] %s is now known as %s.\n\n", friendnumber, name, string);
     printf(msg);
 }
@@ -91,8 +91,8 @@ void print_nickchange(Messenger *messenger, int friendnumber, uint8_t *string, u
 void print_statuschange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(messenger, friendnumber, (uint8_t*)name);
-    char msg[100+length+strlen(name)+1];
+    getname(messenger, friendnumber, (uint8_t *)name);
+    char msg[100 + length + strlen(name) + 1];
     sprintf(msg, "\n\n[i] [%d] %s's status changed to %s.\n\n", friendnumber, name, string);
     printf(msg);
 }
@@ -100,12 +100,14 @@ void print_statuschange(Messenger *messenger, int friendnumber, uint8_t *string,
 void load_key()
 {
     FILE *data_file = NULL;
-    data_file = fopen("data","r");
+    data_file = fopen("data", "r");
+
     if (data_file) {
         fseek(data_file, 0, SEEK_END);
         int size = ftell(data_file);
         fseek(data_file, 0, SEEK_SET);
         uint8_t data[size];
+
         if (fread(data, sizeof(uint8_t), size, data_file) != size) {
             printf("\n[i] Could not read the data file. Exiting.");
             exit(1);
@@ -124,6 +126,7 @@ void load_key()
             exit(1);
         }
     }
+
     fclose(data_file);
 }
 
@@ -131,30 +134,29 @@ void add_friend()
 {
     int i;
     char temp_id[128];
-    
+
     for (i = 0; i < 128; i++)
-        temp_id[i] = line[i+3];
-    
-    int num = m_addfriend(messenger, hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
-   
+        temp_id[i] = line[i + 3];
+
+    int num = m_addfriend(messenger, hex_string_to_bin(temp_id), (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+
     if (num >= 0) {
         char numstring[100];
         sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
         printf(numstring);
         ++maxnumfriends;
-    }
-    else if (num == -1)
+    } else if (num == -1)
         printf("\n[i] Message is too long.\n\n");
-    
+
     else if (num == -2)
         printf("\n[i] Please add a message to your friend request.\n\n");
-    
+
     else if (num == -3)
         printf("\n[i] That appears to be your own ID.\n\n");
-    
+
     else if (num == -4)
         printf("\n[i] Friend request already sent.\n\n");
-    
+
     else if (num == -5)
         printf("\n[i] Undefined error when adding friend\n\n");
 }
@@ -162,28 +164,29 @@ void add_friend()
 void list_friends()
 {
     int i;
-    
+
     printf("\n[i] Friend List");
 
     printf("----- PENDING -----\n\n");
 
     for (i = 0; i <= maxnumfriends; i++) {
         char name[MAX_NAME_LENGTH];
-        getname(messenger, i, (uint8_t*)name);
+        getname(messenger, i, (uint8_t *)name);
+
         if (m_friendstatus(messenger, i) > 0 && m_friendstatus(messenger, i) < 4)
-            printf("[%d] %s\n", i, (uint8_t*)name);
+            printf("[%d] %s\n", i, (uint8_t *)name);
     }
-    
+
     printf("\n");
 
     printf("----- ACTIVE -----\n\n");
 
     for (i = 0; i <= maxnumfriends; i++) {
         char name[MAX_NAME_LENGTH];
-        getname(messenger, i, (uint8_t*)name);
-        
+        getname(messenger, i, (uint8_t *)name);
+
         if (m_friendstatus(messenger, i) == 4)
-            printf("[%d] %s\n", i, (uint8_t*)name);
+            printf("[%d] %s\n", i, (uint8_t *)name);
     }
 
     printf("\n");
@@ -192,14 +195,14 @@ void list_friends()
 void delete_friend()
 {
     size_t len = strlen(line);
-    char numstring[len-3];
+    char numstring[len - 3];
     int i;
-    
+
     for (i = 0; i < len; i++) {
-        if (line[i+3] != ' ')
-            numstring[i] = line[i+3];
+        if (line[i + 3] != ' ')
+            numstring[i] = line[i + 3];
     }
-    
+
     int num = atoi(numstring);
     m_delfriend(messenger, num);
     --maxnumfriends;
@@ -209,20 +212,20 @@ void delete_friend()
 void message_friend()
 {
     size_t len = strlen(line);
-    char numstring[len-3];
-    char message[len-3];
+    char numstring[len - 3];
+    char message[len - 3];
     int i;
-    
+
     for (i = 0; i < len; i++) {
 
-        if (line[i+3] != ' ')
-            numstring[i] = line[i+3];
+        if (line[i + 3] != ' ')
+            numstring[i] = line[i + 3];
 
         else {
             int j;
 
-            for (j = (i+1); j < len; j++)
-                message[j-i-1] = line[j+3];
+            for (j = (i + 1); j < len; j++)
+                message[j - i - 1] = line[j + 3];
 
             break;
         }
@@ -230,9 +233,9 @@ void message_friend()
 
     int num = atoi(numstring);
 
-    if(m_sendmessage(messenger, num, (uint8_t*) message, sizeof(message)) != 1)
+    if (m_sendmessage(messenger, num, (uint8_t *) message, sizeof(message)) != 1)
         printf("\n[i] could not send message (they may be offline): %s\n", message);
-   
+
     else
         printf("\n");
 }
@@ -242,24 +245,24 @@ void change_nickname()
     uint8_t name[MAX_NAME_LENGTH];
     int i = 0;
     size_t len = strlen(line);
-    
+
     for (i = 3; i < len; i++) {
 
         if (line[i] == 0 || line[i] == '\n')
             break;
 
-        name[i-3] = line[i];
+        name[i - 3] = line[i];
     }
-    
-    name[i-3] = 0;
+
+    name[i - 3] = 0;
     setname(messenger, name, i);
     char numstring[100];
-    sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
+    sprintf(numstring, "\n[i] changed nick to %s\n\n", (char *)name);
     printf(numstring);
 
     FILE *name_file = NULL;
     name_file = fopen("namefile.txt", "w");
-    fprintf(name_file, "%s", (char*)name);
+    fprintf(name_file, "%s", (char *)name);
     fclose(name_file);
 }
 
@@ -268,24 +271,24 @@ void change_status(int savetofile)
     uint8_t status[MAX_STATUSMESSAGE_LENGTH];
     int i = 0;
     size_t len = strlen(line);
-    
+
     for (i = 3; i < len; i++) {
         if (line[i] == 0 || line[i] == '\n')
             break;
-        
-        status[i-3] = line[i];
+
+        status[i - 3] = line[i];
     }
 
-    status[i-3] = 0;
-    m_set_statusmessage(messenger, status, strlen((char*)status));
+    status[i - 3] = 0;
+    m_set_statusmessage(messenger, status, strlen((char *)status));
     char numstring[100];
-    sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
+    sprintf(numstring, "\n[i] changed status to %s\n\n", (char *)status);
     printf(numstring);
 
     if (savetofile == 1) {
-        FILE* status_file = NULL;
+        FILE *status_file = NULL;
         status_file = fopen("statusfile.txt", "w");
-        fprintf(status_file, "%s", (char*)status);
+        fprintf(status_file, "%s", (char *)status);
         fclose(status_file);
     }
 }
@@ -295,11 +298,13 @@ void accept_friend_request()
     friend_request_received = 0;
     uint8_t numf = atoi(line + 3);
     char numchar[100];
+
     if (numf >= num_requests || pending_requests[numf].accepted) {
         sprintf(numchar, "\n[i] you either didn't receive that request or you already accepted it");
         printf(numchar);
     } else {
         int num = m_addfriend_norequest(messenger, pending_requests[numf].id);
+
         if (num != -1) {
             pending_requests[numf].accepted = 1;
             sprintf(numchar, "\n[i] Added friendnumber: %d\n\n", num);
@@ -312,13 +317,13 @@ void accept_friend_request()
     }
 }
 
-void line_eval(char* line)
+void line_eval(char *line)
 {
-    if(line[0] == '/') {
+    if (line[0] == '/') {
 
         char inpt_command = line[1];
 
-        if(inpt_command == 'f') {
+        if (inpt_command == 'f') {
             add_friend();
         }
 
@@ -362,7 +367,7 @@ void line_eval(char* line)
 
 void get_input()
 {
-    while(1) {
+    while (1) {
         fgets(line, STRING_LENGTH, stdin);
         line_eval(line);
         strcpy(line, "");
@@ -375,13 +380,16 @@ int main(int argc, char *argv[])
         printf("[!] Usage: %s [IP] [port] [public_key] <nokey>\n", argv[0]);
         exit(0);
     }
+
     messenger = initMessenger();
+
     if (messenger == 0) {
         printf("initMessenger failed");
         exit(0);
     }
+
     if (argc > 4) {
-        if(strncmp(argv[4], "nokey", 6) < 0) {
+        if (strncmp(argv[4], "nokey", 6) < 0) {
         }
     } else {
         load_key();
@@ -390,27 +398,33 @@ int main(int argc, char *argv[])
     int nameloaded = 0;
     int statusloaded = 0;
 
-    FILE* name_file = NULL;
+    FILE *name_file = NULL;
     name_file = fopen("namefile.txt", "r");
-    if(name_file) {
+
+    if (name_file) {
         uint8_t name[MAX_NAME_LENGTH];
+
         while (fgets(line, MAX_NAME_LENGTH, name_file) != NULL) {
-            sscanf(line, "%s", (char*)name);
+            sscanf(line, "%s", (char *)name);
         }
-        setname(messenger, name, strlen((char*)name)+1);
+
+        setname(messenger, name, strlen((char *)name) + 1);
         nameloaded = 1;
         printf("%s\n", name);
         fclose(name_file);
     }
 
-    FILE* status_file = NULL;
+    FILE *status_file = NULL;
     status_file = fopen("statusfile.txt", "r");
-    if(status_file) {
+
+    if (status_file) {
         uint8_t status[MAX_STATUSMESSAGE_LENGTH];
+
         while (fgets(line, MAX_STATUSMESSAGE_LENGTH, status_file) != NULL) {
-            sscanf(line, "%s", (char*)status);
+            sscanf(line, "%s", (char *)status);
         }
-        m_set_statusmessage(messenger, status, strlen((char*)status)+1);
+
+        m_set_statusmessage(messenger, status, strlen((char *)status) + 1);
         statusloaded = 1;
         printf("%s\n", status);
         fclose(status_file);
@@ -423,31 +437,35 @@ int main(int argc, char *argv[])
     char idstring1[PUB_KEY_BYTES][5];
     char idstring2[PUB_KEY_BYTES][5];
     int i;
-    for(i = 0; i < PUB_KEY_BYTES; i++)
-    {
-        if(self_public_key[i] < (PUB_KEY_BYTES/2))
-            strcpy(idstring1[i],"0");
+
+    for (i = 0; i < PUB_KEY_BYTES; i++) {
+        if (self_public_key[i] < (PUB_KEY_BYTES / 2))
+            strcpy(idstring1[i], "0");
         else
             strcpy(idstring1[i], "");
-        sprintf(idstring2[i], "%hhX",self_public_key[i]);
+
+        sprintf(idstring2[i], "%hhX", self_public_key[i]);
     }
-    strcpy(users_id,"[i] your ID: ");
+
+    strcpy(users_id, "[i] your ID: ");
     int j;
+
     for (j = 0; j < PUB_KEY_BYTES; j++) {
-        strcat(users_id,idstring1[j]);
-        strcat(users_id,idstring2[j]);
+        strcat(users_id, idstring1[j]);
+        strcat(users_id, idstring2[j]);
     }
 
     do_header();
-    
+
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
+
     if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else
         exit(1);
-    
+
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
 
     int c;
@@ -465,20 +483,23 @@ int main(int argc, char *argv[])
         printf("\n---------------------------------");
     }
 
-    while(1) {
+    while (1) {
         if (on == 1 && DHT_isconnected() == -1) {
             printf("\n---------------------------------");
             printf("\n[i] Disconnected from the DHT");
             printf("\n---------------------------------\n\n");
             on = 0;
         }
+
         if (on == 0 && DHT_isconnected()) {
             printf("\n[i] Connected to DHT");
             printf("\n---------------------------------\n\n");
             on = 1;
         }
+
         doMessenger(messenger);
         Sleep(1);
     }
+
     return 0;
 }
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h
index 5dfe81c3..b174edcc 100644
--- a/testing/nTox_win32.h
+++ b/testing/nTox_win32.h
@@ -1,5 +1,5 @@
 /*  nTox_win32.h
- * 
+ *
  *  Textual frontend for Tox - Windows version
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -31,7 +31,7 @@
 
 void do_header();
 void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata);
-void print_message(Messenger *messenger, int friendnumber, uint8_t * string, uint16_t length, void *userdata);
+void print_message(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void print_nickchange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void print_statuschange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void load_key();
@@ -42,7 +42,7 @@ void message_friend();
 void change_nickname();
 void change_status(int savetofile);
 void accept_friend_request();
-void line_eval(char* line);
+void line_eval(char *line);
 void get_input();
 
 #endif
diff --git a/testing/timer_test.c b/testing/timer_test.c
index 63083940..f47d4878 100644
--- a/testing/timer_test.c
+++ b/testing/timer_test.c
@@ -3,7 +3,7 @@
 
 #ifdef WINDOWS
 #include <windows.h>
-#else 
+#else
 #include <unistd.h>
 #endif
 
@@ -16,30 +16,32 @@ void mssleep(int ms)
 #endif
 }
 
-int callback(timer* t, void* arg){
-    printf("%s\n", (char*)arg);
+int callback(timer *t, void *arg)
+{
+    printf("%s\n", (char *)arg);
     return 1;
 }
 
-int repeating(timer* t, void *arg) {
-    printf("%s\n", (char*)arg);
+int repeating(timer *t, void *arg)
+{
+    printf("%s\n", (char *)arg);
     timer_start(t, 3);
     return 0;
 }
 
 extern void timer_debug_print();
 
-int main(int argc, char** argv)
+int main(int argc, char **argv)
 {
     timer_init();
     timer_debug_print();
-    
-    timer* t = new_timer();
+
+    timer *t = new_timer();
     timer_setup(t, &callback, "Long setup method, 4 seconds");
     timer_start(t, 4);
     timer_debug_print();
 
-    timer_single(&repeating, (void*)"This repeats every 3 seconds", 3);
+    timer_single(&repeating, (void *)"This repeats every 3 seconds", 3);
     timer_debug_print();
 
     timer_single(&callback, "Short method, 4 seconds", 4);
@@ -53,7 +55,7 @@ int main(int argc, char** argv)
 
     timer_single(&callback, "10 seconds", 10);
     timer_debug_print();
-    
+
     timer_us(&callback, "100000us", 100000);
     timer_us(&callback, "13s", 13 * US_PER_SECOND);
 
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index d5edf956..ef932cd2 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -19,376 +19,391 @@
 #define CURS_Y_OFFSET 3
 
 typedef struct {
-  int friendnum;
-  char line[MAX_STR_SIZE];
-  size_t pos;
-  WINDOW* history;
-  WINDOW* linewin;
+    int friendnum;
+    char line[MAX_STR_SIZE];
+    size_t pos;
+    WINDOW *history;
+    WINDOW *linewin;
 } ChatContext;
 
 void print_help(ChatContext *self);
 void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd);
 
-struct tm *get_time(void) 
+struct tm *get_time(void)
 {
-  struct tm *timeinfo;
-  time_t now;
-  time(&now);
-  timeinfo = localtime(&now);
-  return timeinfo;
+    struct tm *timeinfo;
+    time_t now;
+    time(&now);
+    timeinfo = localtime(&now);
+    return timeinfo;
 }
 
 static void chat_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *msg, uint16_t len)
 {
-  ChatContext *ctx = (ChatContext*) self->x;
-  uint8_t nick[MAX_NAME_LENGTH] = {0};
-  struct tm *timeinfo = get_time();
-
-  if (ctx->friendnum != num)
-    return;
-
-  getname(m, num, (uint8_t*) &nick);
-  msg[len-1] = '\0';
-  nick[MAX_NAME_LENGTH-1] = '\0';
-  fix_name(msg);
-  fix_name(nick);
-
-  wattron(ctx->history, COLOR_PAIR(2));
-  wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-  wattroff(ctx->history, COLOR_PAIR(2));
-  wattron(ctx->history, COLOR_PAIR(4));
-  wprintw(ctx->history, "%s: ", nick);
-  wattroff(ctx->history, COLOR_PAIR(4));
-  wprintw(ctx->history, "%s\n", msg);
-
-  self->blink = true;
-  beep();
+    ChatContext *ctx = (ChatContext *) self->x;
+    uint8_t nick[MAX_NAME_LENGTH] = {0};
+    struct tm *timeinfo = get_time();
+
+    if (ctx->friendnum != num)
+        return;
+
+    getname(m, num, (uint8_t *) &nick);
+    msg[len - 1] = '\0';
+    nick[MAX_NAME_LENGTH - 1] = '\0';
+    fix_name(msg);
+    fix_name(nick);
+
+    wattron(ctx->history, COLOR_PAIR(2));
+    wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+    wattroff(ctx->history, COLOR_PAIR(2));
+    wattron(ctx->history, COLOR_PAIR(4));
+    wprintw(ctx->history, "%s: ", nick);
+    wattroff(ctx->history, COLOR_PAIR(4));
+    wprintw(ctx->history, "%s\n", msg);
+
+    self->blink = true;
+    beep();
 }
 
 static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *action, uint16_t len)
 {
-  ChatContext *ctx = (ChatContext*) self->x;
-  struct tm *timeinfo = get_time();
+    ChatContext *ctx = (ChatContext *) self->x;
+    struct tm *timeinfo = get_time();
 
-  if (ctx->friendnum != num)
-    return;
+    if (ctx->friendnum != num)
+        return;
 
-  action[len-1] = '\0';
-  fix_name(action);
+    action[len - 1] = '\0';
+    fix_name(action);
 
-  wattron(ctx->history, COLOR_PAIR(2));
-  wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-  wattroff(ctx->history, COLOR_PAIR(2));
+    wattron(ctx->history, COLOR_PAIR(2));
+    wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+    wattroff(ctx->history, COLOR_PAIR(2));
 
-  wattron(ctx->history, COLOR_PAIR(5));
-  wprintw(ctx->history, "%s\n", action);
-  wattroff(ctx->history, COLOR_PAIR(5));
+    wattron(ctx->history, COLOR_PAIR(5));
+    wprintw(ctx->history, "%s\n", action);
+    wattroff(ctx->history, COLOR_PAIR(5));
 
-  self->blink = true;
-  beep();
+    self->blink = true;
+    beep();
 }
 
 static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)
 {
-  ChatContext *ctx = (ChatContext*) self->x;
-  struct tm *timeinfo = get_time();
-  if (ctx->friendnum != num)
-    return;
-
-  wattron(ctx->history, COLOR_PAIR(2));
-  wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-  wattroff(ctx->history, COLOR_PAIR(2));
-
-  nick[len-1] = '\0';
-  fix_name(nick);
-  snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
-
-  wattron(ctx->history, COLOR_PAIR(3));
-  wprintw(ctx->history, "* Your partner changed nick to '%s'\n", nick);
-  wattroff(ctx->history, COLOR_PAIR(3));
+    ChatContext *ctx = (ChatContext *) self->x;
+    struct tm *timeinfo = get_time();
+
+    if (ctx->friendnum != num)
+        return;
+
+    wattron(ctx->history, COLOR_PAIR(2));
+    wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+    wattroff(ctx->history, COLOR_PAIR(2));
+
+    nick[len - 1] = '\0';
+    fix_name(nick);
+    snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
+
+    wattron(ctx->history, COLOR_PAIR(3));
+    wprintw(ctx->history, "* Your partner changed nick to '%s'\n", nick);
+    wattroff(ctx->history, COLOR_PAIR(3));
 }
 
 static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len)
 {
-  ChatContext *ctx = (ChatContext*) self->x;
-  struct tm *timeinfo = get_time();
-  if (ctx->friendnum != num)
-    return;
-
-  wattron(ctx->history, COLOR_PAIR(2));
-  wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-  wattroff(ctx->history, COLOR_PAIR(2));
-
-  status[len-1] = '\0';
-  fix_name(status);
-  snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
-
-  wattron(ctx->history, COLOR_PAIR(3));
-  wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
-  wattroff(ctx->history, COLOR_PAIR(3));
-  
+    ChatContext *ctx = (ChatContext *) self->x;
+    struct tm *timeinfo = get_time();
+
+    if (ctx->friendnum != num)
+        return;
+
+    wattron(ctx->history, COLOR_PAIR(2));
+    wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+    wattroff(ctx->history, COLOR_PAIR(2));
+
+    status[len - 1] = '\0';
+    fix_name(status);
+    snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
+
+    wattron(ctx->history, COLOR_PAIR(3));
+    wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
+    wattroff(ctx->history, COLOR_PAIR(3));
+
 }
 
 /* check that the string has one non-space character */
 int string_is_empty(char *string)
 {
-  int rc = 0;
-  char *copy = strdup(string);
-  rc = ((strtok(copy, " ") == NULL) ? 1:0);
-  free(copy);
-  return rc;
+    int rc = 0;
+    char *copy = strdup(string);
+    rc = ((strtok(copy, " ") == NULL) ? 1 : 0);
+    free(copy);
+    return rc;
 }
 
 static void chat_onKey(ToxWindow *self, Messenger *m, int key)
 {
-  ChatContext *ctx = (ChatContext*) self->x;
-  struct tm *timeinfo = get_time();
-
-  int x, y, y2, x2;
-  getyx(self->window, y, x);
-  getmaxyx(self->window, y2, x2);
-
-  /* Add printable chars to buffer and print on input space */
-  if (isprint(key)) {
-    if (ctx->pos != sizeof(ctx->line)-1) {
-      mvwaddch(self->window, y, x, key);
-      ctx->line[ctx->pos++] = key;
-      ctx->line[ctx->pos] = '\0';
+    ChatContext *ctx = (ChatContext *) self->x;
+    struct tm *timeinfo = get_time();
+
+    int x, y, y2, x2;
+    getyx(self->window, y, x);
+    getmaxyx(self->window, y2, x2);
+
+    /* Add printable chars to buffer and print on input space */
+    if (isprint(key)) {
+        if (ctx->pos != sizeof(ctx->line) - 1) {
+            mvwaddch(self->window, y, x, key);
+            ctx->line[ctx->pos++] = key;
+            ctx->line[ctx->pos] = '\0';
+        }
     }
-  }
-
-  /* BACKSPACE key: Remove one character from line */
-  else if (key == 0x107 || key == 0x8 || key == 0x7f) {
-    if (ctx->pos > 0) {
-      ctx->line[--ctx->pos] = '\0';
-      if (x == 0)
-        mvwdelch(self->window, y-1, x2-1);
-      else
-        mvwdelch(self->window, y, x-1);
+
+    /* BACKSPACE key: Remove one character from line */
+    else if (key == 0x107 || key == 0x8 || key == 0x7f) {
+        if (ctx->pos > 0) {
+            ctx->line[--ctx->pos] = '\0';
+
+            if (x == 0)
+                mvwdelch(self->window, y - 1, x2 - 1);
+            else
+                mvwdelch(self->window, y, x - 1);
+        }
     }
-  }
-
-  /* RETURN key: Execute command or print line */
-  else if (key == '\n') {
-    wclear(ctx->linewin);
-    wmove(self->window, y2-CURS_Y_OFFSET, 0);
-    wclrtobot(self->window);
-    if (ctx->line[0] == '/')
-      execute(self, ctx, m, ctx->line);
-    else {
-      /* make sure the string has at least non-space character */
-      if (!string_is_empty(ctx->line)) {
-        uint8_t selfname[MAX_NAME_LENGTH];
-        getself_name(m, selfname, sizeof(selfname));
-        fix_name(selfname);
 
-        wattron(ctx->history, COLOR_PAIR(2));
-        wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-        wattroff(ctx->history, COLOR_PAIR(2));
-        wattron(ctx->history, COLOR_PAIR(1));
-        wprintw(ctx->history, "%s: ", selfname);
-        wattroff(ctx->history, COLOR_PAIR(1));
-        wprintw(ctx->history, "%s\n", ctx->line);
-        if (m_sendmessage(m, ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) == 0) {
-          wattron(ctx->history, COLOR_PAIR(3));
-          wprintw(ctx->history, " * Failed to send message.\n");
-          wattroff(ctx->history, COLOR_PAIR(3));
+    /* RETURN key: Execute command or print line */
+    else if (key == '\n') {
+        wclear(ctx->linewin);
+        wmove(self->window, y2 - CURS_Y_OFFSET, 0);
+        wclrtobot(self->window);
+
+        if (ctx->line[0] == '/')
+            execute(self, ctx, m, ctx->line);
+        else {
+            /* make sure the string has at least non-space character */
+            if (!string_is_empty(ctx->line)) {
+                uint8_t selfname[MAX_NAME_LENGTH];
+                getself_name(m, selfname, sizeof(selfname));
+                fix_name(selfname);
+
+                wattron(ctx->history, COLOR_PAIR(2));
+                wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+                wattroff(ctx->history, COLOR_PAIR(2));
+                wattron(ctx->history, COLOR_PAIR(1));
+                wprintw(ctx->history, "%s: ", selfname);
+                wattroff(ctx->history, COLOR_PAIR(1));
+                wprintw(ctx->history, "%s\n", ctx->line);
+
+                if (m_sendmessage(m, ctx->friendnum, (uint8_t *) ctx->line, strlen(ctx->line) + 1) == 0) {
+                    wattron(ctx->history, COLOR_PAIR(3));
+                    wprintw(ctx->history, " * Failed to send message.\n");
+                    wattroff(ctx->history, COLOR_PAIR(3));
+                }
+            }
         }
-      }
+
+        ctx->line[0] = '\0';
+        ctx->pos = 0;
     }
-    ctx->line[0] = '\0';
-    ctx->pos = 0;
-  }
 }
 
 void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
 {
-  if (!strcmp(cmd, "/clear") || !strcmp(cmd, "/c")) {
-    wclear(self->window);
-    wclear(ctx->history);
-    int x, y;
-    getmaxyx(self->window, y, x);
-    (void) x;
-    wmove(self->window, y-CURS_Y_OFFSET, 0);
-  }
-
-  else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
-    print_help(ctx);
+    if (!strcmp(cmd, "/clear") || !strcmp(cmd, "/c")) {
+        wclear(self->window);
+        wclear(ctx->history);
+        int x, y;
+        getmaxyx(self->window, y, x);
+        (void) x;
+        wmove(self->window, y - CURS_Y_OFFSET, 0);
+    }
 
-  else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
-    endwin();
-    exit(0);
-  }
+    else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
+        print_help(ctx);
 
-  else if (!strncmp(cmd, "/me ", strlen("/me "))) {
-    struct tm *timeinfo = get_time();
-    char *action = strchr(cmd, ' ');
-    if (action == NULL) {
-      wprintw(self->window, "Invalid syntax.\n");
-      return;
+    else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
+        endwin();
+        exit(0);
     }
-    action++;
 
-    wattron(ctx->history, COLOR_PAIR(2));
-    wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-    wattroff(ctx->history, COLOR_PAIR(2));
+    else if (!strncmp(cmd, "/me ", strlen("/me "))) {
+        struct tm *timeinfo = get_time();
+        char *action = strchr(cmd, ' ');
 
-    uint8_t selfname[MAX_NAME_LENGTH];
-    int len = getself_name(m, selfname, sizeof(selfname));
-    char msg[MAX_STR_SIZE-len-4];
-    snprintf(msg, sizeof(msg), "* %s %s\n", (uint8_t*) selfname, action);
+        if (action == NULL) {
+            wprintw(self->window, "Invalid syntax.\n");
+            return;
+        }
 
-    wattron(ctx->history, COLOR_PAIR(5));
-    wprintw(ctx->history, msg);
-    wattroff(ctx->history, COLOR_PAIR(5));
-    if (m_sendaction(m, ctx->friendnum, (uint8_t*) msg, strlen(msg)+1) < 0) {
-      wattron(ctx->history, COLOR_PAIR(3));
-      wprintw(ctx->history, " * Failed to send action\n");
-      wattroff(ctx->history, COLOR_PAIR(3));
-    }
-  }
-
-  else if (!strncmp(cmd, "/status ", strlen("/status "))) {
-    char *status = strchr(cmd, ' ');
-    char *msg;
-    char *status_text;
-    if (status == NULL) {
-      wprintw(ctx->history, "Invalid syntax.\n");
-      return;
-    }
-    status++;
-    USERSTATUS status_kind;
-    if (!strncmp(status, "online", strlen("online"))) {
-      status_kind = USERSTATUS_NONE;
-      status_text = "ONLINE";
-    }
+        action++;
 
-    else if (!strncmp(status, "away", strlen("away"))) {
-      status_kind = USERSTATUS_AWAY;
-      status_text = "AWAY";
-    }
+        wattron(ctx->history, COLOR_PAIR(2));
+        wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+        wattroff(ctx->history, COLOR_PAIR(2));
 
-    else if (!strncmp(status, "busy", strlen("busy"))) {
-      status_kind = USERSTATUS_BUSY;
-      status_text = "BUSY";
-    }
+        uint8_t selfname[MAX_NAME_LENGTH];
+        int len = getself_name(m, selfname, sizeof(selfname));
+        char msg[MAX_STR_SIZE - len - 4];
+        snprintf(msg, sizeof(msg), "* %s %s\n", (uint8_t *) selfname, action);
 
-    else {
-      wprintw(ctx->history, "Invalid status.\n");
-      return;
-    }
+        wattron(ctx->history, COLOR_PAIR(5));
+        wprintw(ctx->history, msg);
+        wattroff(ctx->history, COLOR_PAIR(5));
 
-    msg = strchr(status, ' ');
-    if (msg == NULL) {
-      m_set_userstatus(m, status_kind);
-      wprintw(ctx->history, "Status set to: %s\n", status_text);
+        if (m_sendaction(m, ctx->friendnum, (uint8_t *) msg, strlen(msg) + 1) < 0) {
+            wattron(ctx->history, COLOR_PAIR(3));
+            wprintw(ctx->history, " * Failed to send action\n");
+            wattroff(ctx->history, COLOR_PAIR(3));
+        }
     }
-    else {
-      msg++;
-      m_set_userstatus(m, status_kind);
-      m_set_statusmessage(m, ( uint8_t*) msg, strlen(msg)+1);
-      wprintw(ctx->history, "Status set to: %s, %s\n", status_text, msg);
+
+    else if (!strncmp(cmd, "/status ", strlen("/status "))) {
+        char *status = strchr(cmd, ' ');
+        char *msg;
+        char *status_text;
+
+        if (status == NULL) {
+            wprintw(ctx->history, "Invalid syntax.\n");
+            return;
+        }
+
+        status++;
+        USERSTATUS status_kind;
+
+        if (!strncmp(status, "online", strlen("online"))) {
+            status_kind = USERSTATUS_NONE;
+            status_text = "ONLINE";
+        }
+
+        else if (!strncmp(status, "away", strlen("away"))) {
+            status_kind = USERSTATUS_AWAY;
+            status_text = "AWAY";
+        }
+
+        else if (!strncmp(status, "busy", strlen("busy"))) {
+            status_kind = USERSTATUS_BUSY;
+            status_text = "BUSY";
+        }
+
+        else {
+            wprintw(ctx->history, "Invalid status.\n");
+            return;
+        }
+
+        msg = strchr(status, ' ');
+
+        if (msg == NULL) {
+            m_set_userstatus(m, status_kind);
+            wprintw(ctx->history, "Status set to: %s\n", status_text);
+        } else {
+            msg++;
+            m_set_userstatus(m, status_kind);
+            m_set_statusmessage(m, ( uint8_t *) msg, strlen(msg) + 1);
+            wprintw(ctx->history, "Status set to: %s, %s\n", status_text, msg);
+        }
     }
-  }
-
-  else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
-    char *nick;
-    nick = strchr(cmd, ' ');
-    if (nick == NULL) {
-      wprintw(ctx->history, "Invalid syntax.\n");
-      return;
+
+    else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
+        char *nick;
+        nick = strchr(cmd, ' ');
+
+        if (nick == NULL) {
+            wprintw(ctx->history, "Invalid syntax.\n");
+            return;
+        }
+
+        nick++;
+        setname(m, (uint8_t *) nick, strlen(nick) + 1);
+        wprintw(ctx->history, "Nickname set to: %s\n", nick);
     }
 
-    nick++;
-    setname(m, (uint8_t*) nick, strlen(nick)+1);
-    wprintw(ctx->history, "Nickname set to: %s\n", nick);
-  }
-
-  else if (!strcmp(cmd, "/myid")) {
-    char id[FRIEND_ADDRESS_SIZE*2+1] = {0};
-    int i;
-    uint8_t address[FRIEND_ADDRESS_SIZE];
-    getaddress(m, address);
-    for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
-      char xx[3];
-      snprintf(xx, sizeof(xx), "%02X",  address[i] & 0xff);
-      strcat(id, xx);
+    else if (!strcmp(cmd, "/myid")) {
+        char id[FRIEND_ADDRESS_SIZE * 2 + 1] = {0};
+        int i;
+        uint8_t address[FRIEND_ADDRESS_SIZE];
+        getaddress(m, address);
+
+        for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+            char xx[3];
+            snprintf(xx, sizeof(xx), "%02X",  address[i] & 0xff);
+            strcat(id, xx);
+        }
+
+        wprintw(ctx->history, "%s\n", id);
     }
-    wprintw(ctx->history, "%s\n", id);
-  }
 
-  else if (strcmp(ctx->line, "/close") == 0) {
-    int f_num = ctx->friendnum;
-    delwin(ctx->linewin);
-    del_window(self, f_num);
-  }
+    else if (strcmp(ctx->line, "/close") == 0) {
+        int f_num = ctx->friendnum;
+        delwin(ctx->linewin);
+        del_window(self, f_num);
+    }
 
-  else
-    wprintw(ctx->history, "Invalid command.\n");
+    else
+        wprintw(ctx->history, "Invalid command.\n");
 }
 
 static void chat_onDraw(ToxWindow *self)
 {
-  curs_set(1);
-  int x, y;
-  getmaxyx(self->window, y, x);
-  (void) y;
-  ChatContext *ctx = (ChatContext*) self->x;
-  mvwhline(ctx->linewin, 0, 0, '_', x);
-  wrefresh(self->window);
+    curs_set(1);
+    int x, y;
+    getmaxyx(self->window, y, x);
+    (void) y;
+    ChatContext *ctx = (ChatContext *) self->x;
+    mvwhline(ctx->linewin, 0, 0, '_', x);
+    wrefresh(self->window);
 }
 
 static void chat_onInit(ToxWindow *self, Messenger *m)
 {
-  int x, y;
-  ChatContext *ctx = (ChatContext*) self->x;
-  getmaxyx(self->window, y, x);
-  ctx->history = subwin(self->window, y-4, x, 0, 0);
-  scrollok(ctx->history, 1);
-  ctx->linewin = subwin(self->window, 2, x, y-4, 0);
-  print_help(ctx);
-  wmove(self->window, y-CURS_Y_OFFSET, 0);
+    int x, y;
+    ChatContext *ctx = (ChatContext *) self->x;
+    getmaxyx(self->window, y, x);
+    ctx->history = subwin(self->window, y - 4, x, 0, 0);
+    scrollok(ctx->history, 1);
+    ctx->linewin = subwin(self->window, 2, x, y - 4, 0);
+    print_help(ctx);
+    wmove(self->window, y - CURS_Y_OFFSET, 0);
 }
 
 void print_help(ChatContext *self)
 {
-  wattron(self->history, COLOR_PAIR(2) | A_BOLD);
-  wprintw(self->history, "Commands:\n");
-  wattroff(self->history, A_BOLD);
-
-  wprintw(self->history, "      /status <type> <message>   : Set your status\n");
-  wprintw(self->history, "      /nick <nickname>           : Set your nickname\n");
-  wprintw(self->history, "      /me <action>               : Do an action\n");
-  wprintw(self->history, "      /myid                      : Print your ID\n");
-  wprintw(self->history, "      /clear                     : Clear the screen\n");
-  wprintw(self->history, "      /close                     : Close the current chat window\n");
-  wprintw(self->history, "      /quit or /exit             : Exit program\n");
-  wprintw(self->history, "      /help                      : Print this message again\n\n");
-
-  wattroff(self->history, COLOR_PAIR(2));
+    wattron(self->history, COLOR_PAIR(2) | A_BOLD);
+    wprintw(self->history, "Commands:\n");
+    wattroff(self->history, A_BOLD);
+
+    wprintw(self->history, "      /status <type> <message>   : Set your status\n");
+    wprintw(self->history, "      /nick <nickname>           : Set your nickname\n");
+    wprintw(self->history, "      /me <action>               : Do an action\n");
+    wprintw(self->history, "      /myid                      : Print your ID\n");
+    wprintw(self->history, "      /clear                     : Clear the screen\n");
+    wprintw(self->history, "      /close                     : Close the current chat window\n");
+    wprintw(self->history, "      /quit or /exit             : Exit program\n");
+    wprintw(self->history, "      /help                      : Print this message again\n\n");
+
+    wattroff(self->history, COLOR_PAIR(2));
 }
 
 ToxWindow new_chat(Messenger *m, int friendnum)
 {
-  ToxWindow ret;
-  memset(&ret, 0, sizeof(ret));
-
-  ret.onKey = &chat_onKey;
-  ret.onDraw = &chat_onDraw;
-  ret.onInit = &chat_onInit;
-  ret.onMessage = &chat_onMessage;
-  ret.onNickChange = &chat_onNickChange;
-  ret.onStatusChange = &chat_onStatusChange;
-  ret.onAction = &chat_onAction;
-
-  uint8_t nick[MAX_NAME_LENGTH] = {0};
-  getname(m, friendnum, (uint8_t*) &nick);
-  fix_name(nick);
-
-  snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);
-
-  ChatContext *x = calloc(1, sizeof(ChatContext));
-  x->friendnum = friendnum;
-  ret.x = (void*) x;
-  return ret;
+    ToxWindow ret;
+    memset(&ret, 0, sizeof(ret));
+
+    ret.onKey = &chat_onKey;
+    ret.onDraw = &chat_onDraw;
+    ret.onInit = &chat_onInit;
+    ret.onMessage = &chat_onMessage;
+    ret.onNickChange = &chat_onNickChange;
+    ret.onStatusChange = &chat_onStatusChange;
+    ret.onAction = &chat_onAction;
+
+    uint8_t nick[MAX_NAME_LENGTH] = {0};
+    getname(m, friendnum, (uint8_t *) &nick);
+    fix_name(nick);
+
+    snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);
+
+    ChatContext *x = calloc(1, sizeof(ChatContext));
+    x->friendnum = friendnum;
+    ret.x = (void *) x;
+    return ret;
 }
diff --git a/testing/toxic/configdir.c b/testing/toxic/configdir.c
index 18e211ce..1a62e8ed 100644
--- a/testing/toxic/configdir.c
+++ b/testing/toxic/configdir.c
@@ -50,6 +50,7 @@ char *get_user_config_dir(void)
     BOOL ok;
 
     ok = SHGetSpecialFolderPathA(NULL, appdata, CSIDL_PROFILE, TRUE);
+
     if (!ok) {
         return NULL;
     }
@@ -72,13 +73,16 @@ char *get_user_config_dir(void)
     int rc;
 
     rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
+
     if (rc == 0) {
         home = pwd.pw_dir;
     } else {
         home = getenv("HOME");
+
         if (home == NULL) {
             return NULL;
         }
+
         /* env variables can be tainted */
         snprintf(buf, sizeof(buf), "%s", home);
         home = buf;
@@ -87,6 +91,7 @@ char *get_user_config_dir(void)
 # if defined(__APPLE__)
     len = strlen(home) + strlen("/Library/Application Support") + 1;
     user_config_dir = malloc(len);
+
     if (user_config_dir == NULL) {
         return NULL;
     }
@@ -95,6 +100,7 @@ char *get_user_config_dir(void)
 # else /* __APPLE__ */
     len = strlen(home) + strlen("/.config") + 1;
     user_config_dir = malloc(len);
+
     if (user_config_dir == NULL) {
         return NULL;
     }
@@ -111,44 +117,45 @@ char *get_user_config_dir(void)
  * Creates the config directory.
  */
 int create_user_config_dir(char *path)
-{ 
+{
 
-  int mkdir_err;
+    int mkdir_err;
 
-  #ifdef WIN32
+#ifdef WIN32
 
-  char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
-  strcpy(fullpath, path);
-  strcat(fullpath, CONFIGDIR);
+    char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
+    strcpy(fullpath, path);
+    strcat(fullpath, CONFIGDIR);
 
-  mkdir_err = _mkdir(fullpath);
-  struct __stat64 buf;
-  if (mkdir_err && (errno != EEXIST || _wstat64(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
-    free(fullpath);
-    return -1;
-  }
+    mkdir_err = _mkdir(fullpath);
+    struct __stat64 buf;
 
-  #else
+    if (mkdir_err && (errno != EEXIST || _wstat64(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
+        free(fullpath);
+        return -1;
+    }
 
-  mkdir_err = mkdir(path, 0700);
-  struct stat buf;
+#else
 
-  if(mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
-    return -1;
-  }
+    mkdir_err = mkdir(path, 0700);
+    struct stat buf;
 
-  char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
-  strcpy(fullpath, path);
-  strcat(fullpath, CONFIGDIR);
+    if (mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
+        return -1;
+    }
 
-  mkdir_err = mkdir(fullpath, 0700);
+    char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
+    strcpy(fullpath, path);
+    strcat(fullpath, CONFIGDIR);
+
+    mkdir_err = mkdir(fullpath, 0700);
+
+    if (mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
+        free(fullpath);
+        return -1;
+    }
 
-  if(mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
+#endif
     free(fullpath);
-    return -1;
-  }
-    
-  #endif
-  free(fullpath);
-  return 0;
+    return 0;
 }
diff --git a/testing/toxic/configdir.h b/testing/toxic/configdir.h
index fad949cf..17d95107 100644
--- a/testing/toxic/configdir.h
+++ b/testing/toxic/configdir.h
@@ -23,7 +23,7 @@
 #else
 #define CONFIGDIR "/toxic/"
 #endif
- 
+
 #ifndef S_ISDIR
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #endif
diff --git a/testing/toxic/dhtstatus.c b/testing/toxic/dhtstatus.c
index e026a173..a11dc616 100644
--- a/testing/toxic/dhtstatus.c
+++ b/testing/toxic/dhtstatus.c
@@ -3,87 +3,97 @@
 #include "../../core/network.h"
 #include "../../core/DHT.h"
 
-typedef uint8_t ipbuf[3*4+3+1];
+typedef uint8_t ipbuf[3 * 4 + 3 + 1];
 static int num_selected = 0;
 
-static void printip(ipbuf buf, IP ip) 
+static void printip(ipbuf buf, IP ip)
 {
-  sprintf((char*)buf, "%u.%u.%u.%u", ip.c[0], ip.c[1], ip.c[2], ip.c[3]);
+    sprintf((char *)buf, "%u.%u.%u.%u", ip.c[0], ip.c[1], ip.c[2], ip.c[3]);
 }
 
 static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
 {
-  switch(key) {
-    case KEY_UP:
-    case 'k':
-    if (--num_selected < 0)
-      num_selected = CLIENT_ID_SIZE-1;
-    break;
-    
-    case KEY_DOWN:
-    case 'j':
-    num_selected = (num_selected+1) % CLIENT_ID_SIZE;
-    break;
-    
-    case '\n':
-    break;
-    
-    default:
-    break;
-  }
+    switch (key) {
+        case KEY_UP:
+        case 'k':
+            if (--num_selected < 0)
+                num_selected = CLIENT_ID_SIZE - 1;
+
+            break;
+
+        case KEY_DOWN:
+        case 'j':
+            num_selected = (num_selected + 1) % CLIENT_ID_SIZE;
+            break;
+
+        case '\n':
+            break;
+
+        default:
+            break;
+    }
 }
 
 static void dhtstatus_onDraw(ToxWindow *self)
 {
-  Client_data  * close_clientlist = DHT_get_close_list();
-  curs_set(0);
-  werase(self->window);
-  
-  uint64_t now = unix_time();
-  uint32_t i, j;
-  ipbuf ipbuf;
-  wprintw(self->window,"\n%llu  ______________________ CLOSE LIST ________________________  ___ IP ADDR ___ _PRT_   LST   PNG    ____ SELF ____ _PRT_  LST\n\n", now);
-  for(i = 0; i < 32; i++) { /*Number of nodes in closelist*/
-    Client_data * client = close_clientlist + i;
-    if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
-    wprintw(self->window,"[%02i]  ", i);
-    uint16_t port = ntohs(client->ip_port.port);
-    if(port) {
-      for(j = 0; j < CLIENT_ID_SIZE; j++)
-        wprintw(self->window, "%02hhx", client->client_id[j]);
-          
-      printip(ipbuf, client->ip_port.ip);
-      wprintw(self->window, "  %15s %5u ", ipbuf, port);
-      wprintw(self->window, "  %3llu ", now - client->timestamp);
-      wprintw(self->window, "  %3llu ", now - client->last_pinged);
-      
-      port = ntohs(client->ret_ip_port.port);
-      if(port) {
-        printip(ipbuf, client->ret_ip_port.ip);
-        wprintw(self->window, "  %15s %5u  %3llu", ipbuf, port, now - close_clientlist[i].ret_timestamp);
-      }
+    Client_data   *close_clientlist = DHT_get_close_list();
+    curs_set(0);
+    werase(self->window);
+
+    uint64_t now = unix_time();
+    uint32_t i, j;
+    ipbuf ipbuf;
+    wprintw(self->window,
+            "\n%llu  ______________________ CLOSE LIST ________________________  ___ IP ADDR ___ _PRT_   LST   PNG    ____ SELF ____ _PRT_  LST\n\n",
+            now);
+
+    for (i = 0; i < 32; i++) { /*Number of nodes in closelist*/
+        Client_data *client = close_clientlist + i;
+
+        if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
+
+        wprintw(self->window, "[%02i]  ", i);
+        uint16_t port = ntohs(client->ip_port.port);
+
+        if (port) {
+            for (j = 0; j < CLIENT_ID_SIZE; j++)
+                wprintw(self->window, "%02hhx", client->client_id[j]);
+
+            printip(ipbuf, client->ip_port.ip);
+            wprintw(self->window, "  %15s %5u ", ipbuf, port);
+            wprintw(self->window, "  %3llu ", now - client->timestamp);
+            wprintw(self->window, "  %3llu ", now - client->last_pinged);
+
+            port = ntohs(client->ret_ip_port.port);
+
+            if (port) {
+                printip(ipbuf, client->ret_ip_port.ip);
+                wprintw(self->window, "  %15s %5u  %3llu", ipbuf, port, now - close_clientlist[i].ret_timestamp);
+            }
+        }
+
+        wprintw(self->window, "\n");
+
+        if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
     }
-    wprintw(self->window, "\n"); 
-    if (i == num_selected) wattroff(self->window, COLOR_PAIR(3)); 
-  }
-  
-  wrefresh(self->window);
+
+    wrefresh(self->window);
 }
 
 static void dhtstatus_onInit(ToxWindow *self, Messenger *m)
 {
 
 }
-  
-ToxWindow new_dhtstatus() 
+
+ToxWindow new_dhtstatus()
 {
-        ToxWindow ret;
-        memset(&ret, 0, sizeof(ret));
+    ToxWindow ret;
+    memset(&ret, 0, sizeof(ret));
 
-        ret.onKey          = &dhtstatus_onKey;
-        ret.onDraw         = &dhtstatus_onDraw;
-        ret.onInit         = &dhtstatus_onInit;
+    ret.onKey          = &dhtstatus_onKey;
+    ret.onDraw         = &dhtstatus_onDraw;
+    ret.onInit         = &dhtstatus_onInit;
 
-        strcpy(ret.title, "[dht status]");
-        return ret;
+    strcpy(ret.title, "[dht status]");
+    return ret;
 }
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index e7504fbf..c85fd3ae 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -13,13 +13,13 @@
 #include "windows.h"
 #include "friendlist.h"
 
-static char * WINDOW_STATUS;
+static char *WINDOW_STATUS;
 
 typedef struct {
-  uint8_t name[MAX_NAME_LENGTH];
-  uint8_t status[MAX_STATUSMESSAGE_LENGTH];
-  int num;
-  int chatwin;
+    uint8_t name[MAX_NAME_LENGTH];
+    uint8_t status[MAX_STATUSMESSAGE_LENGTH];
+    int num;
+    int chatwin;
 } friend_t;
 
 static friend_t friends[MAX_FRIENDS_NUM];
@@ -28,135 +28,143 @@ static int num_selected = 0;
 
 void fix_name(uint8_t *name)
 {
-  /* Remove all non alphanumeric characters */
-  uint8_t *p = name;
-  uint8_t *q = name;
-  while(*p != 0) {
-    if (isprint(*p))
-      *q++ = *p;
-    p++;
-  }
-  *q = 0;
+    /* Remove all non alphanumeric characters */
+    uint8_t *p = name;
+    uint8_t *q = name;
+
+    while (*p != 0) {
+        if (isprint(*p))
+            *q++ = *p;
+
+        p++;
+    }
+
+    *q = 0;
 }
 
 void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str, uint16_t len)
 {
-  if (num >= num_friends)
-    return;
-
-  if (friends[num].chatwin == -1) {
-    friends[num].chatwin = num;
-    int i;
-    /* Find first open slot to hold chat window */
-    for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-      if (WINDOW_STATUS[i] == -1) {
-        WINDOW_STATUS[i] = num;
-        add_window(m, new_chat(m, num), i);
-        break;
-      }
+    if (num >= num_friends)
+        return;
+
+    if (friends[num].chatwin == -1) {
+        friends[num].chatwin = num;
+        int i;
+
+        /* Find first open slot to hold chat window */
+        for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+            if (WINDOW_STATUS[i] == -1) {
+                WINDOW_STATUS[i] = num;
+                add_window(m, new_chat(m, num), i);
+                break;
+            }
+        }
     }
-  }
 }
 
 void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
 {
-  if (len >= MAX_NAME_LENGTH || num >= num_friends)
-    return;
+    if (len >= MAX_NAME_LENGTH || num >= num_friends)
+        return;
 
-  memcpy((char*) &friends[num].name, (char*) str, len);
-  friends[num].name[len] = 0;
-  fix_name(friends[num].name);
+    memcpy((char *) &friends[num].name, (char *) str, len);
+    friends[num].name[len] = 0;
+    fix_name(friends[num].name);
 }
 
 void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
 {
-  if (len >= MAX_STATUSMESSAGE_LENGTH || num >= num_friends)
-    return;
+    if (len >= MAX_STATUSMESSAGE_LENGTH || num >= num_friends)
+        return;
 
-  memcpy((char*) &friends[num].status, (char*) str, len);
-  friends[num].status[len] = 0;
-  fix_name(friends[num].status);
+    memcpy((char *) &friends[num].status, (char *) str, len);
+    friends[num].status[len] = 0;
+    fix_name(friends[num].status);
 }
 
 int friendlist_onFriendAdded(Messenger *m, int num)
 {
-  if (num_friends == MAX_FRIENDS_NUM)
-    return -1;
-
-  friends[num_friends].num = num;
-  getname(m, num, friends[num_friends].name);
-  strcpy((char*) friends[num_friends].name, "unknown");
-  strcpy((char*) friends[num_friends].status, "unknown");
-  friends[num_friends++].chatwin = -1;
-  return 0;
+    if (num_friends == MAX_FRIENDS_NUM)
+        return -1;
+
+    friends[num_friends].num = num;
+    getname(m, num, friends[num_friends].name);
+    strcpy((char *) friends[num_friends].name, "unknown");
+    strcpy((char *) friends[num_friends].status, "unknown");
+    friends[num_friends++].chatwin = -1;
+    return 0;
 }
 
 static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
 {
-  if (key == KEY_UP) {
-    if (--num_selected < 0)
-      num_selected = num_friends-1;
-  }
-  else if (key == KEY_DOWN) {
-    if (num_friends != 0)
-      num_selected = (num_selected+1) % num_friends;
-  }
-  else if (key == '\n') {
-    /* Jump to chat window if already open */
-    if (friends[num_selected].chatwin != -1) {
-      int i;
-      for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-        if (WINDOW_STATUS[i] == num_selected) {
-          set_active_window(i);
-          break;
-        }
-      }
-    }else {
-      int i;
-      for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-        if (WINDOW_STATUS[i] == -1) {
-          WINDOW_STATUS[i] = num_selected;
-          friends[num_selected].chatwin = num_selected;
-          add_window(m, new_chat(m, num_selected), i);
-          break;
+    if (key == KEY_UP) {
+        if (--num_selected < 0)
+            num_selected = num_friends - 1;
+    } else if (key == KEY_DOWN) {
+        if (num_friends != 0)
+            num_selected = (num_selected + 1) % num_friends;
+    } else if (key == '\n') {
+        /* Jump to chat window if already open */
+        if (friends[num_selected].chatwin != -1) {
+            int i;
+
+            for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+                if (WINDOW_STATUS[i] == num_selected) {
+                    set_active_window(i);
+                    break;
+                }
+            }
+        } else {
+            int i;
+
+            for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+                if (WINDOW_STATUS[i] == -1) {
+                    WINDOW_STATUS[i] = num_selected;
+                    friends[num_selected].chatwin = num_selected;
+                    add_window(m, new_chat(m, num_selected), i);
+                    break;
+                }
+            }
         }
-      }
     }
-  }
 }
 
 static void friendlist_onDraw(ToxWindow *self)
 {
-  curs_set(0);
-  werase(self->window);
-  if (num_friends == 0) {
-    wprintw(self->window, "Empty. Add some friends! :-)\n");
-  }
-  else {
-    wattron(self->window, COLOR_PAIR(2) | A_BOLD);
-    wprintw(self->window, "Open chat with.. (up/down keys, enter)\n");
-    wattroff(self->window, COLOR_PAIR(2) | A_BOLD);
-  }
-
-  wprintw(self->window, "\n");
-  int i;
-  for (i = 0; i < num_friends; ++i) {
-    if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
-    wprintw(self->window, "  [#%d] ", friends[i].num);
-    if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
-
-    attron(A_BOLD);
-    wprintw(self->window, "%s ", friends[i].name);
-    attroff(A_BOLD);
-
-    wprintw(self->window, "(%s)\n", friends[i].status);
-  }
-  wrefresh(self->window);
+    curs_set(0);
+    werase(self->window);
+
+    if (num_friends == 0) {
+        wprintw(self->window, "Empty. Add some friends! :-)\n");
+    } else {
+        wattron(self->window, COLOR_PAIR(2) | A_BOLD);
+        wprintw(self->window, "Open chat with.. (up/down keys, enter)\n");
+        wattroff(self->window, COLOR_PAIR(2) | A_BOLD);
+    }
+
+    wprintw(self->window, "\n");
+    int i;
+
+    for (i = 0; i < num_friends; ++i) {
+        if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
+
+        wprintw(self->window, "  [#%d] ", friends[i].num);
+
+        if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
+
+        attron(A_BOLD);
+        wprintw(self->window, "%s ", friends[i].name);
+        attroff(A_BOLD);
+
+        wprintw(self->window, "(%s)\n", friends[i].status);
+    }
+
+    wrefresh(self->window);
 }
 
 void disable_chatwin(int f_num)
 {
-  friends[f_num].chatwin = -1;
+    friends[f_num].chatwin = -1;
 }
 
 static void friendlist_onInit(ToxWindow *self, Messenger *m)
@@ -164,19 +172,20 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 
 }
 
-ToxWindow new_friendlist(char * ws) {
-  WINDOW_STATUS = ws;
-  ToxWindow ret;
-  memset(&ret, 0, sizeof(ret));
-
-  ret.onKey = &friendlist_onKey;
-  ret.onDraw = &friendlist_onDraw;
-  ret.onInit = &friendlist_onInit;
-  ret.onMessage = &friendlist_onMessage;
-  ret.onAction = &friendlist_onMessage;    // Action has identical behaviour to message
-  ret.onNickChange = &friendlist_onNickChange;
-  ret.onStatusChange = &friendlist_onStatusChange;
-
-  strcpy(ret.title, "[friends]");
-  return ret;
+ToxWindow new_friendlist(char *ws)
+{
+    WINDOW_STATUS = ws;
+    ToxWindow ret;
+    memset(&ret, 0, sizeof(ret));
+
+    ret.onKey = &friendlist_onKey;
+    ret.onDraw = &friendlist_onDraw;
+    ret.onInit = &friendlist_onInit;
+    ret.onMessage = &friendlist_onMessage;
+    ret.onAction = &friendlist_onMessage;    // Action has identical behaviour to message
+    ret.onNickChange = &friendlist_onNickChange;
+    ret.onStatusChange = &friendlist_onStatusChange;
+
+    strcpy(ret.title, "[friends]");
+    return ret;
 }
diff --git a/testing/toxic/friendlist.h b/testing/toxic/friendlist.h
index c3d8dac7..f0c27f53 100644
--- a/testing/toxic/friendlist.h
+++ b/testing/toxic/friendlist.h
@@ -4,7 +4,7 @@
 #include "windows.h"
 #include "chat.h"
 
-ToxWindow new_friendlist(char * ws);
+ToxWindow new_friendlist(char *ws);
 int friendlist_onFriendAdded(Messenger *m, int num);
 void disable_chatwin(int f_num);
 void fix_name(uint8_t *name);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 38c20df6..816873b3 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -28,7 +28,7 @@
 /* Export for use in Callbacks */
 char *DATA_FILE = NULL;
 
-void on_window_resize(int sig) 
+void on_window_resize(int sig)
 {
     endwin();
     refresh();
@@ -37,44 +37,45 @@ void on_window_resize(int sig)
 
 static void init_term()
 {
-  /* Setup terminal */
-  signal(SIGWINCH, on_window_resize);
-  initscr();
-  cbreak();
-  keypad(stdscr, 1);
-  noecho();
-  timeout(100);
-
-  if (has_colors()) {
-    start_color();
-    init_pair(1, COLOR_GREEN, COLOR_BLACK);
-    init_pair(2, COLOR_CYAN, COLOR_BLACK);
-    init_pair(3, COLOR_RED, COLOR_BLACK);
-    init_pair(4, COLOR_BLUE, COLOR_BLACK);
-    init_pair(5, COLOR_YELLOW, COLOR_BLACK);
-  }
-  refresh();
+    /* Setup terminal */
+    signal(SIGWINCH, on_window_resize);
+    initscr();
+    cbreak();
+    keypad(stdscr, 1);
+    noecho();
+    timeout(100);
+
+    if (has_colors()) {
+        start_color();
+        init_pair(1, COLOR_GREEN, COLOR_BLACK);
+        init_pair(2, COLOR_CYAN, COLOR_BLACK);
+        init_pair(3, COLOR_RED, COLOR_BLACK);
+        init_pair(4, COLOR_BLUE, COLOR_BLACK);
+        init_pair(5, COLOR_YELLOW, COLOR_BLACK);
+    }
+
+    refresh();
 }
 
 static Messenger *init_tox()
 {
-  /* Init core */
-  Messenger *m = initMessenger();
-
-  /* Callbacks */
-  m_callback_friendrequest(m, on_request, NULL);
-  m_callback_friendmessage(m, on_message, NULL);
-  m_callback_namechange(m, on_nickchange, NULL);
-  m_callback_statusmessage(m, on_statuschange, NULL);
-  m_callback_action(m, on_action, NULL);
+    /* Init core */
+    Messenger *m = initMessenger();
+
+    /* Callbacks */
+    m_callback_friendrequest(m, on_request, NULL);
+    m_callback_friendmessage(m, on_message, NULL);
+    m_callback_namechange(m, on_nickchange, NULL);
+    m_callback_statusmessage(m, on_statuschange, NULL);
+    m_callback_action(m, on_action, NULL);
 #ifdef __linux__
-  setname(m, (uint8_t*) "Cool guy", sizeof("Cool guy"));
+    setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
 #elif WIN32
-  setname(m, (uint8_t*) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
+    setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
 #else
-  setname(m, (uint8_t*) "Hipster", sizeof("Hipster"));
+    setname(m, (uint8_t *) "Hipster", sizeof("Hipster"));
 #endif
-  return m;
+    return m;
 }
 
 #define MAXLINE 90    /* Approx max number of chars in a sever line (IP + port + key) */
@@ -84,67 +85,75 @@ static Messenger *init_tox()
 /* Connects to a random DHT server listed in the DHTservers file */
 int init_connection(void)
 {
-  if (DHT_isconnected())
-    return 0;
+    if (DHT_isconnected())
+        return 0;
+
+    FILE *fp = fopen("../../../other/DHTservers", "r");
+
+    if (!fp)
+        return 1;
+
+    char servers[MAXSERVERS][MAXLINE];
+    char line[MAXLINE];
+    int linecnt = 0;
+
+    while (fgets(line, sizeof(line), fp) && linecnt < MAXSERVERS) {
+        if (strlen(line) > MINLINE)
+            strcpy(servers[linecnt++], line);
+    }
+
+    if (linecnt < 1) {
+        fclose(fp);
+        return 2;
+    }
 
-  FILE *fp = fopen("../../../other/DHTservers", "r");
-  if (!fp)
-    return 1;
-
-  char servers[MAXSERVERS][MAXLINE];
-  char line[MAXLINE];
-  int linecnt = 0;
-  while (fgets(line, sizeof(line), fp) && linecnt < MAXSERVERS) {
-    if (strlen(line) > MINLINE)
-      strcpy(servers[linecnt++], line);
-  }
-  if (linecnt < 1) {
     fclose(fp);
-    return 2;
-  }
-  fclose(fp);
-
-  char *server = servers[rand() % linecnt];
-  char *ip = strtok(server, " ");
-  char *port = strtok(NULL, " ");
-  char *key = strtok(NULL, " ");
-  if (!ip || !port || !key)
-    return 3;
-
-  IP_Port dht;
-  dht.port = htons(atoi(port));
-  uint32_t resolved_address = resolve_addr(ip);
-  if (resolved_address == 0)
+
+    char *server = servers[rand() % linecnt];
+    char *ip = strtok(server, " ");
+    char *port = strtok(NULL, " ");
+    char *key = strtok(NULL, " ");
+
+    if (!ip || !port || !key)
+        return 3;
+
+    IP_Port dht;
+    dht.port = htons(atoi(port));
+    uint32_t resolved_address = resolve_addr(ip);
+
+    if (resolved_address == 0)
+        return 0;
+
+    dht.ip.i = resolved_address;
+    unsigned char *binary_string = hex_string_to_bin(key);
+    DHT_bootstrap(dht, binary_string);
+    free(binary_string);
     return 0;
-  dht.ip.i = resolved_address;
-  unsigned char *binary_string = hex_string_to_bin(key);
-  DHT_bootstrap(dht, binary_string);
-  free(binary_string);
-  return 0;
 }
 
-static void do_tox(Messenger *m, ToxWindow * prompt)
+static void do_tox(Messenger *m, ToxWindow *prompt)
 {
-  static int conn_try = 0;
-  static int conn_err = 0;
-  static bool dht_on = false;
-  if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) {
-    if (!conn_err) {
-      conn_err = init_connection();
-      wprintw(prompt->window, "\nEstablishing connection...\n");
-      if (conn_err)
-        wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
+    static int conn_try = 0;
+    static int conn_err = 0;
+    static bool dht_on = false;
+
+    if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) {
+        if (!conn_err) {
+            conn_err = init_connection();
+            wprintw(prompt->window, "\nEstablishing connection...\n");
+
+            if (conn_err)
+                wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
+        }
+    } else if (!dht_on && DHT_isconnected()) {
+        dht_on = true;
+        wprintw(prompt->window, "\nDHT connected.\n");
+    } else if (dht_on && !DHT_isconnected()) {
+        dht_on = false;
+        wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n");
     }
-  }
-  else if (!dht_on && DHT_isconnected()) {
-    dht_on = true;
-    wprintw(prompt->window, "\nDHT connected.\n");
-  }
-  else if (dht_on && !DHT_isconnected()) {
-    dht_on = false;
-    wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n");
-  }
-  doMessenger(m);
+
+    doMessenger(m);
 }
 
 int f_loadfromfile;
@@ -160,18 +169,22 @@ int store_data(Messenger *m, char *path)
 {
     if (f_loadfromfile == 0) /*If file loading/saving is disabled*/
         return 0;
+
     FILE *fd;
     size_t len;
     uint8_t *buf;
 
     len = Messenger_size(m);
     buf = malloc(len);
+
     if (buf == NULL) {
         return 1;
     }
+
     Messenger_save(m, buf);
 
     fd = fopen(path, "w");
+
     if (fd == NULL) {
         free(buf);
         return 2;
@@ -192,6 +205,7 @@ static void load_data(Messenger *m, char *path)
 {
     if (f_loadfromfile == 0) /*If file loading/saving is disabled*/
         return;
+
     FILE *fd;
     size_t len;
     uint8_t *buf;
@@ -202,12 +216,14 @@ static void load_data(Messenger *m, char *path)
         fseek(fd, 0, SEEK_SET);
 
         buf = malloc(len);
+
         if (buf == NULL) {
             fprintf(stderr, "malloc() failed.\n");
             fclose(fd);
             endwin();
             exit(1);
         }
+
         if (fread(buf, len, 1, fd) != 1) {
             fprintf(stderr, "fread() failed.\n");
             free(buf);
@@ -215,9 +231,11 @@ static void load_data(Messenger *m, char *path)
             endwin();
             exit(1);
         }
+
         Messenger_load(m, buf, len);
 
         uint32_t i;
+
         for (i = 0; i < m->numfriends; i++) {
             on_friendadded(m, i);
         }
@@ -226,6 +244,7 @@ static void load_data(Messenger *m, char *path)
         fclose(fd);
     } else {
         int st;
+
         if ((st = store_data(m, path)) != 0) {
             fprintf(stderr, "Store messenger failed with return code: %d\n", st);
             endwin();
@@ -236,70 +255,74 @@ static void load_data(Messenger *m, char *path)
 
 int main(int argc, char *argv[])
 {
-  char *user_config_dir = get_user_config_dir();
-  int config_err = 0;
-
-  f_loadfromfile = 1;
-  int f_flag = 0;
-  int i = 0;
-  for (i = 0; i < argc; ++i) {
-    if (argv[i] == NULL)
-      break;
-    else if (argv[i][0] == '-') {
-      if (argv[i][1] == 'f') {
-        if (argv[i + 1] != NULL)
-          DATA_FILE = strdup(argv[i + 1]);
-        else
-          f_flag = -1;
-      } else if (argv[i][1] == 'n') {
-          f_loadfromfile = 0;
-      }
+    char *user_config_dir = get_user_config_dir();
+    int config_err = 0;
+
+    f_loadfromfile = 1;
+    int f_flag = 0;
+    int i = 0;
+
+    for (i = 0; i < argc; ++i) {
+        if (argv[i] == NULL)
+            break;
+        else if (argv[i][0] == '-') {
+            if (argv[i][1] == 'f') {
+                if (argv[i + 1] != NULL)
+                    DATA_FILE = strdup(argv[i + 1]);
+                else
+                    f_flag = -1;
+            } else if (argv[i][1] == 'n') {
+                f_loadfromfile = 0;
+            }
+        }
+    }
+
+    if (DATA_FILE == NULL ) {
+        config_err = create_user_config_dir(user_config_dir);
+
+        if (config_err) {
+            DATA_FILE = strdup("data");
+        } else {
+            DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
+            strcpy(DATA_FILE, user_config_dir);
+            strcat(DATA_FILE, CONFIGDIR);
+            strcat(DATA_FILE, "data");
+        }
+    }
+
+    free(user_config_dir);
+
+    init_term();
+    Messenger *m = init_tox();
+    ToxWindow *prompt = init_windows(m);
+    init_window_status();
+
+    if (f_loadfromfile)
+        load_data(m, DATA_FILE);
+
+    if (f_flag == -1) {
+        attron(COLOR_PAIR(3) | A_BOLD);
+        wprintw(prompt->window, "You passed '-f' without giving an argument.\n"
+                "defaulting to 'data' for a keyfile...\n");
+        attroff(COLOR_PAIR(3) | A_BOLD);
     }
-  }
 
-  if (DATA_FILE == NULL ) {
-    config_err = create_user_config_dir(user_config_dir);
     if (config_err) {
-      DATA_FILE = strdup("data");
-    } else {
-      DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
-      strcpy(DATA_FILE, user_config_dir);
-      strcat(DATA_FILE, CONFIGDIR);
-      strcat(DATA_FILE, "data");
+        attron(COLOR_PAIR(3) | A_BOLD);
+        wprintw(prompt->window, "Unable to determine configuration directory.\n"
+                "defaulting to 'data' for a keyfile...\n");
+        attroff(COLOR_PAIR(3) | A_BOLD);
+    }
+
+    while (true) {
+        /* Update tox */
+        do_tox(m, prompt);
+
+        /* Draw */
+        draw_active_window(m);
     }
-  }
-  free(user_config_dir);
-
-  init_term();
-  Messenger *m = init_tox();
-  ToxWindow *prompt = init_windows(m);
-  init_window_status();
-
-  if(f_loadfromfile)
-    load_data(m, DATA_FILE);
-
-  if (f_flag == -1) {
-    attron(COLOR_PAIR(3) | A_BOLD);
-    wprintw(prompt->window, "You passed '-f' without giving an argument.\n"
-                            "defaulting to 'data' for a keyfile...\n");
-    attroff(COLOR_PAIR(3) | A_BOLD);
-  }
-
-  if(config_err) {
-    attron(COLOR_PAIR(3) | A_BOLD);
-    wprintw(prompt->window, "Unable to determine configuration directory.\n"
-                            "defaulting to 'data' for a keyfile...\n");
-    attroff(COLOR_PAIR(3) | A_BOLD);
-  }
-  while(true) {
-    /* Update tox */
-    do_tox(m, prompt);
-
-    /* Draw */
-    draw_active_window(m);
-  }
-
-  cleanupMessenger(m);
-  free(DATA_FILE);
-  return 0;
+
+    cleanupMessenger(m);
+    free(DATA_FILE);
+    return 0;
 }
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 1d0e0144..f6d3e21f 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -14,7 +14,7 @@
 #include "prompt.h"
 
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
-uint8_t num_requests=0; // XXX
+uint8_t num_requests = 0; // XXX
 
 static friendAddedFn *on_friendadded_cb;
 static char prompt_buf[MAX_STR_SIZE] = {0};
@@ -36,412 +36,441 @@ void cmd_statusmsg(ToxWindow *, Messenger *m, char **);
 #define NUM_COMMANDS 13
 
 static struct {
-  char *name;
-  int numargs;
-  void (*func)(ToxWindow *, Messenger *m, char **);
+    char *name;
+    int numargs;
+    void (*func)(ToxWindow *, Messenger *m, char **);
 } commands[] = {
-  { "accept",    1, cmd_accept    },
-  { "add",       1, cmd_add       },
-  { "clear",     0, cmd_clear     },
-  { "connect",   3, cmd_connect   },
-  { "exit",      0, cmd_quit      },
-  { "help",      0, cmd_help      },
-  { "msg",       2, cmd_msg       },
-  { "myid",      0, cmd_myid      },
-  { "nick",      1, cmd_nick      },
-  { "q",         0, cmd_quit      },
-  { "quit",      0, cmd_quit      },
-  { "status",    2, cmd_status    },
-  { "statusmsg", 1, cmd_statusmsg },
+    { "accept",    1, cmd_accept    },
+    { "add",       1, cmd_add       },
+    { "clear",     0, cmd_clear     },
+    { "connect",   3, cmd_connect   },
+    { "exit",      0, cmd_quit      },
+    { "help",      0, cmd_help      },
+    { "msg",       2, cmd_msg       },
+    { "myid",      0, cmd_myid      },
+    { "nick",      1, cmd_nick      },
+    { "q",         0, cmd_quit      },
+    { "quit",      0, cmd_quit      },
+    { "status",    2, cmd_status    },
+    { "statusmsg", 1, cmd_statusmsg },
 };
 
 // XXX:
 int add_req(uint8_t *public_key)
 {
-  memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
-  ++num_requests;
-  return num_requests-1;
+    memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
+    ++num_requests;
+    return num_requests - 1;
 }
 
 // XXX: FIX
 unsigned char *hex_string_to_bin(char hex_string[])
 {
-  size_t len = strlen(hex_string);
-  unsigned char *val = malloc(len);
-  char *pos = hex_string;
-  int i;
-  for (i = 0; i < len; ++i, pos+=2)
-    sscanf(pos,"%2hhx",&val[i]);
-  return val;
+    size_t len = strlen(hex_string);
+    unsigned char *val = malloc(len);
+    char *pos = hex_string;
+    int i;
+
+    for (i = 0; i < len; ++i, pos += 2)
+        sscanf(pos, "%2hhx", &val[i]);
+
+    return val;
 }
 
 void cmd_accept(ToxWindow *self, Messenger *m, char **args)
 {
-  int num = atoi(args[1]);
-  if (num >= num_requests) {
-    wprintw(self->window, "Invalid syntax.\n");
-    return;
-  }
-
-  num = m_addfriend_norequest(m, pending_requests[num]);
-  if (num == -1)
-    wprintw(self->window, "Failed to add friend.\n");
-  else {
-    wprintw(self->window, "Friend accepted as: %d.\n", num);
-    on_friendadded_cb(m, num);
-  }
+    int num = atoi(args[1]);
+
+    if (num >= num_requests) {
+        wprintw(self->window, "Invalid syntax.\n");
+        return;
+    }
+
+    num = m_addfriend_norequest(m, pending_requests[num]);
+
+    if (num == -1)
+        wprintw(self->window, "Failed to add friend.\n");
+    else {
+        wprintw(self->window, "Friend accepted as: %d.\n", num);
+        on_friendadded_cb(m, num);
+    }
 }
 
 void cmd_add(ToxWindow *self, Messenger *m, char **args)
 {
-  uint8_t id_bin[FRIEND_ADDRESS_SIZE];
-  char xx[3];
-  uint32_t x;
-  char *id = args[1];
-  char *msg = args[2];
-
-  if (!id) {
-    wprintw(self->window, "Invalid command: add expected at least one argument.\n");
-    return;
-  }
-  if (!msg)
-    msg = "";
-
-  if (strlen(id) != 2*FRIEND_ADDRESS_SIZE) {
-    wprintw(self->window, "Invalid ID length.\n");
-    return;
-  }
-  int i;
-  for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
-    xx[0] = id[2*i];
-    xx[1] = id[2*i+1];
-    xx[2] = '\0';
-    if (sscanf(xx, "%02x", &x) != 1) {
-      wprintw(self->window, "Invalid ID.\n");
-      return;
+    uint8_t id_bin[FRIEND_ADDRESS_SIZE];
+    char xx[3];
+    uint32_t x;
+    char *id = args[1];
+    char *msg = args[2];
+
+    if (!id) {
+        wprintw(self->window, "Invalid command: add expected at least one argument.\n");
+        return;
+    }
+
+    if (!msg)
+        msg = "";
+
+    if (strlen(id) != 2 * FRIEND_ADDRESS_SIZE) {
+        wprintw(self->window, "Invalid ID length.\n");
+        return;
+    }
+
+    int i;
+
+    for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
+        xx[0] = id[2 * i];
+        xx[1] = id[2 * i + 1];
+        xx[2] = '\0';
+
+        if (sscanf(xx, "%02x", &x) != 1) {
+            wprintw(self->window, "Invalid ID.\n");
+            return;
+        }
+
+        id_bin[i] = x;
+    }
+
+    for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+        id[i] = toupper(id[i]);
+    }
+
+    int num = m_addfriend(m, id_bin, (uint8_t *) msg, strlen(msg) + 1);
+
+    switch (num) {
+        case FAERR_TOOLONG:
+            wprintw(self->window, "Message is too long.\n");
+            break;
+
+        case FAERR_NOMESSAGE:
+            wprintw(self->window, "Please add a message to your request.\n");
+            break;
+
+        case FAERR_OWNKEY:
+            wprintw(self->window, "That appears to be your own ID.\n");
+            break;
+
+        case FAERR_ALREADYSENT:
+            wprintw(self->window, "Friend request already sent.\n");
+            break;
+
+        case FAERR_UNKNOWN:
+            wprintw(self->window, "Undefined error when adding friend.\n");
+            break;
+
+        case FAERR_BADCHECKSUM:
+            wprintw(self->window, "Bad checksum in address.\n");
+            break;
+
+        case FAERR_SETNEWNOSPAM:
+            wprintw(self->window, "Nospam was different.\n");
+            break;
+
+        default:
+            wprintw(self->window, "Friend added as %d.\n", num);
+            on_friendadded_cb(m, num);
+            break;
     }
-    id_bin[i] = x;
-  }
-  
-  for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
-    id[i] = toupper(id[i]);
-  }
-  
-  int num = m_addfriend(m, id_bin, (uint8_t*) msg, strlen(msg)+1);
-  switch (num) {
-  case FAERR_TOOLONG:
-    wprintw(self->window, "Message is too long.\n");
-    break;
-  case FAERR_NOMESSAGE:
-    wprintw(self->window, "Please add a message to your request.\n");
-    break;
-  case FAERR_OWNKEY:
-    wprintw(self->window, "That appears to be your own ID.\n");
-    break;
-  case FAERR_ALREADYSENT:
-    wprintw(self->window, "Friend request already sent.\n");
-    break;
-  case FAERR_UNKNOWN:
-    wprintw(self->window, "Undefined error when adding friend.\n");
-    break;
-  case FAERR_BADCHECKSUM:
-    wprintw(self->window, "Bad checksum in address.\n");
-    break;
-  case FAERR_SETNEWNOSPAM:
-    wprintw(self->window, "Nospam was different.\n");
-    break;
-  default:
-    wprintw(self->window, "Friend added as %d.\n", num);
-    on_friendadded_cb(m, num);
-    break;
-  }
 }
 
 void cmd_clear(ToxWindow *self, Messenger *m, char **args)
 {
-  wclear(self->window);
+    wclear(self->window);
 }
 
 void cmd_connect(ToxWindow *self, Messenger *m, char **args)
 {
-  IP_Port dht;
-  char *ip = args[1];
-  char *port = args[2];
-  char *key = args[3];
-
-  if (atoi(port) == 0) {
-    wprintw(self->window, "Invalid syntax.\n");
-    return;
-  }
-
-  dht.port = htons(atoi(port));
-  uint32_t resolved_address = resolve_addr(ip);
-  if (resolved_address == 0) {
-    return;
-  }
-
-  dht.ip.i = resolved_address;
-  unsigned char *binary_string = hex_string_to_bin(key);
-  DHT_bootstrap(dht, binary_string);
-  free(binary_string);
+    IP_Port dht;
+    char *ip = args[1];
+    char *port = args[2];
+    char *key = args[3];
+
+    if (atoi(port) == 0) {
+        wprintw(self->window, "Invalid syntax.\n");
+        return;
+    }
+
+    dht.port = htons(atoi(port));
+    uint32_t resolved_address = resolve_addr(ip);
+
+    if (resolved_address == 0) {
+        return;
+    }
+
+    dht.ip.i = resolved_address;
+    unsigned char *binary_string = hex_string_to_bin(key);
+    DHT_bootstrap(dht, binary_string);
+    free(binary_string);
 }
 
 void cmd_quit(ToxWindow *self, Messenger *m, char **args)
 {
-  endwin();
-  exit(0);
+    endwin();
+    exit(0);
 }
 
 void cmd_help(ToxWindow *self, Messenger *m, char **args)
 {
-  wclear(self->window);
-  wattron(self->window, COLOR_PAIR(2) | A_BOLD);
-  wprintw(self->window, "Commands:\n");
-  wattroff(self->window, A_BOLD);
-
-  wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
-  wprintw(self->window, "      add <id> <message>        : Add friend\n");
-  wprintw(self->window, "      status <type> <message>   : Set your status\n");
-  wprintw(self->window, "      statusmsg  <message>      : Set your status\n");
-  wprintw(self->window, "      nick <nickname>           : Set your nickname\n");
-  wprintw(self->window, "      accept <number>           : Accept friend request\n");
-  wprintw(self->window, "      myid                      : Print your ID\n");
-  wprintw(self->window, "      quit/exit                 : Exit program\n");
-  wprintw(self->window, "      help                      : Print this message again\n");
-  wprintw(self->window, "      clear                     : Clear this window\n");
-
-  wattron(self->window, A_BOLD);
-  wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n");
-  wattroff(self->window, A_BOLD);
-
-  wattroff(self->window, COLOR_PAIR(2));
+    wclear(self->window);
+    wattron(self->window, COLOR_PAIR(2) | A_BOLD);
+    wprintw(self->window, "Commands:\n");
+    wattroff(self->window, A_BOLD);
+
+    wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
+    wprintw(self->window, "      add <id> <message>        : Add friend\n");
+    wprintw(self->window, "      status <type> <message>   : Set your status\n");
+    wprintw(self->window, "      statusmsg  <message>      : Set your status\n");
+    wprintw(self->window, "      nick <nickname>           : Set your nickname\n");
+    wprintw(self->window, "      accept <number>           : Accept friend request\n");
+    wprintw(self->window, "      myid                      : Print your ID\n");
+    wprintw(self->window, "      quit/exit                 : Exit program\n");
+    wprintw(self->window, "      help                      : Print this message again\n");
+    wprintw(self->window, "      clear                     : Clear this window\n");
+
+    wattron(self->window, A_BOLD);
+    wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n");
+    wattroff(self->window, A_BOLD);
+
+    wattroff(self->window, COLOR_PAIR(2));
 }
 
 void cmd_msg(ToxWindow *self, Messenger *m, char **args)
 {
-  char *id = args[1];
-  char *msg = args[2];
-  if (m_sendmessage(m, atoi(id), (uint8_t*) msg, strlen(msg)+1) == 0)
-    wprintw(self->window, "Error occurred while sending message.\n");
-  else
-    wprintw(self->window, "Message successfully sent.\n");
+    char *id = args[1];
+    char *msg = args[2];
+
+    if (m_sendmessage(m, atoi(id), (uint8_t *) msg, strlen(msg) + 1) == 0)
+        wprintw(self->window, "Error occurred while sending message.\n");
+    else
+        wprintw(self->window, "Message successfully sent.\n");
 }
 
 void cmd_myid(ToxWindow *self, Messenger *m, char **args)
 {
-  char id[FRIEND_ADDRESS_SIZE*2 + 1] = {0};
-  size_t i;
-  uint8_t address[FRIEND_ADDRESS_SIZE];
-  getaddress(m, address);
-  for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
-    char xx[3];
-    snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
-    strcat(id, xx);
-  }
-  wprintw(self->window, "%s\n", id);
+    char id[FRIEND_ADDRESS_SIZE * 2 + 1] = {0};
+    size_t i;
+    uint8_t address[FRIEND_ADDRESS_SIZE];
+    getaddress(m, address);
+
+    for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
+        char xx[3];
+        snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
+        strcat(id, xx);
+    }
+
+    wprintw(self->window, "%s\n", id);
 }
 
 void cmd_nick(ToxWindow *self, Messenger *m, char **args)
 {
-  char *nick = args[1];
-  setname(m, (uint8_t*) nick, strlen(nick)+1);
-  wprintw(self->window, "Nickname set to: %s\n", nick);
+    char *nick = args[1];
+    setname(m, (uint8_t *) nick, strlen(nick) + 1);
+    wprintw(self->window, "Nickname set to: %s\n", nick);
 }
 
 void cmd_status(ToxWindow *self, Messenger *m, char **args)
 {
-  char *status = args[1];
-  char *status_text;
-
-  USERSTATUS status_kind;
-  if (!strncmp(status, "online", strlen("online"))) {
-    status_kind = USERSTATUS_NONE;
-    status_text = "ONLINE";
-  }
-  else if (!strncmp(status, "away", strlen("away"))) {
-    status_kind = USERSTATUS_AWAY;
-    status_text = "AWAY";
-  }
-  else if (!strncmp(status, "busy", strlen("busy"))) {
-    status_kind = USERSTATUS_BUSY;
-    status_text = "BUSY";
-  }
-  else
-  {
-    wprintw(self->window, "Invalid status.\n");
-    return;
-  }
-
-  char *msg = args[2];
-  if (msg == NULL) {
-    m_set_userstatus(m, status_kind);
-    wprintw(self->window, "Status set to: %s\n", status_text);
-  }
-  else {
-    m_set_userstatus(m, status_kind);
-    m_set_statusmessage(m, (uint8_t*) msg, strlen(msg)+1);
-    wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
-  }
+    char *status = args[1];
+    char *status_text;
+
+    USERSTATUS status_kind;
+
+    if (!strncmp(status, "online", strlen("online"))) {
+        status_kind = USERSTATUS_NONE;
+        status_text = "ONLINE";
+    } else if (!strncmp(status, "away", strlen("away"))) {
+        status_kind = USERSTATUS_AWAY;
+        status_text = "AWAY";
+    } else if (!strncmp(status, "busy", strlen("busy"))) {
+        status_kind = USERSTATUS_BUSY;
+        status_text = "BUSY";
+    } else {
+        wprintw(self->window, "Invalid status.\n");
+        return;
+    }
+
+    char *msg = args[2];
+
+    if (msg == NULL) {
+        m_set_userstatus(m, status_kind);
+        wprintw(self->window, "Status set to: %s\n", status_text);
+    } else {
+        m_set_userstatus(m, status_kind);
+        m_set_statusmessage(m, (uint8_t *) msg, strlen(msg) + 1);
+        wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
+    }
 }
 
 void cmd_statusmsg(ToxWindow *self, Messenger *m, char **args)
 {
     char *msg = args[1];
-    m_set_statusmessage(m, (uint8_t*) msg, strlen(msg)+1);
+    m_set_statusmessage(m, (uint8_t *) msg, strlen(msg) + 1);
     wprintw(self->window, "Status set to: %s\n", msg);
 }
 
 static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
 {
-  int newlines = 0;
-  char cmd[MAX_STR_SIZE] = {0};
-  int i;
-  for (i = 0; i < strlen(prompt_buf); ++i) {
-    if (u_cmd[i] == '\n')
-      ++newlines;
-    else
-      cmd[i - newlines] = u_cmd[i];
-  }
-
-  int leading_spc = 0;
-  for (i = 0; i < MAX_STR_SIZE && isspace(cmd[i]); ++i)
-    leading_spc++;
-  memmove(cmd, cmd + leading_spc, MAX_STR_SIZE - leading_spc);
-
-  int cmd_end = strlen(cmd);
-  while (cmd_end > 0 && cmd_end--)
-    if (!isspace(cmd[cmd_end]))
-      break;
-  cmd[cmd_end + 1] = '\0';
-
-  /* insert \0 at argument boundaries */
-  int numargs = 0;
-  for (i = 0; i < MAX_STR_SIZE; i++) {
-    if (cmd[i] == '\"')
-      while (cmd[++i] != '\"'); /* skip over strings */
-    if (cmd[i] == ' ') {
-      cmd[i] = '\0';
-      numargs++;
+    int newlines = 0;
+    char cmd[MAX_STR_SIZE] = {0};
+    int i;
+
+    for (i = 0; i < strlen(prompt_buf); ++i) {
+        if (u_cmd[i] == '\n')
+            ++newlines;
+        else
+            cmd[i - newlines] = u_cmd[i];
     }
-  }
-
-  /* excessive arguments */
-  if (numargs > 3) {
-    wprintw(self->window, "Invalid command: too many arguments.\n");
-    return;
-  }
-
-  /* read arguments into array */
-  char *cmdargs[5];
-  int pos = 0;
-  for (i = 0; i < 5; i++) {
-    cmdargs[i] = cmd + pos;
-    pos += strlen(cmdargs[i]) + 1;
-  }
-
-  /* no input */
-  if (strlen(cmdargs[0]) == 0)
-    return;
-
-  /* match input to command list */
-  for (i = 0; i < NUM_COMMANDS; i++) {
-    if (!strcmp(cmdargs[0], commands[i].name)) {
-      /* check for missing arguments */
-      int j;
-      for (j = 0; j <= commands[i].numargs; j++) {
-        if (strlen(cmdargs[j]) == 0) {
-          wprintw(self->window, "Invalid command: %s expected %d arguments, got %d.\n",
-                  commands[i].name, commands[i].numargs, j - 1);
-          return;
+
+    int leading_spc = 0;
+
+    for (i = 0; i < MAX_STR_SIZE && isspace(cmd[i]); ++i)
+        leading_spc++;
+
+    memmove(cmd, cmd + leading_spc, MAX_STR_SIZE - leading_spc);
+
+    int cmd_end = strlen(cmd);
+
+    while (cmd_end > 0 && cmd_end--)
+        if (!isspace(cmd[cmd_end]))
+            break;
+
+    cmd[cmd_end + 1] = '\0';
+
+    /* insert \0 at argument boundaries */
+    int numargs = 0;
+
+    for (i = 0; i < MAX_STR_SIZE; i++) {
+        if (cmd[i] == '\"')
+            while (cmd[++i] != '\"'); /* skip over strings */
+
+        if (cmd[i] == ' ') {
+            cmd[i] = '\0';
+            numargs++;
         }
-      }
-      /* check for excess arguments */
-      if (strcmp(cmdargs[0], "add") && strlen(cmdargs[j]) != 0) {
-        wprintw(self->window, "Invalid command: too many arguments to %s.\n", commands[i].name);
+    }
+
+    /* excessive arguments */
+    if (numargs > 3) {
+        wprintw(self->window, "Invalid command: too many arguments.\n");
         return;
-      }
-      /* pass arguments to command function */
-      (commands[i].func)(self, m, cmdargs);
-      return;
     }
-  }
 
-  /* no match */
-  wprintw(self->window, "Invalid command.\n");
+    /* read arguments into array */
+    char *cmdargs[5];
+    int pos = 0;
+
+    for (i = 0; i < 5; i++) {
+        cmdargs[i] = cmd + pos;
+        pos += strlen(cmdargs[i]) + 1;
+    }
+
+    /* no input */
+    if (strlen(cmdargs[0]) == 0)
+        return;
+
+    /* match input to command list */
+    for (i = 0; i < NUM_COMMANDS; i++) {
+        if (!strcmp(cmdargs[0], commands[i].name)) {
+            /* check for missing arguments */
+            int j;
+
+            for (j = 0; j <= commands[i].numargs; j++) {
+                if (strlen(cmdargs[j]) == 0) {
+                    wprintw(self->window, "Invalid command: %s expected %d arguments, got %d.\n",
+                            commands[i].name, commands[i].numargs, j - 1);
+                    return;
+                }
+            }
+
+            /* check for excess arguments */
+            if (strcmp(cmdargs[0], "add") && strlen(cmdargs[j]) != 0) {
+                wprintw(self->window, "Invalid command: too many arguments to %s.\n", commands[i].name);
+                return;
+            }
+
+            /* pass arguments to command function */
+            (commands[i].func)(self, m, cmdargs);
+            return;
+        }
+    }
+
+    /* no match */
+    wprintw(self->window, "Invalid command.\n");
 }
 
 static void prompt_onKey(ToxWindow *self, Messenger *m, int key)
 {
-  /* Add printable characters to line */
-  if (isprint(key)) {
-    if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
-      wprintw(self->window, "\nToo Long.\n");
-      prompt_buf_pos = 0;
-      prompt_buf[0] = 0;
-    }
-    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
-                                 && (prompt_buf_pos % (COLS - 3) == 0)) {
-      prompt_buf[prompt_buf_pos++] = '\n';
+    /* Add printable characters to line */
+    if (isprint(key)) {
+        if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
+            wprintw(self->window, "\nToo Long.\n");
+            prompt_buf_pos = 0;
+            prompt_buf[0] = 0;
+        } else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
+                   && (prompt_buf_pos % (COLS - 3) == 0)) {
+            prompt_buf[prompt_buf_pos++] = '\n';
+        } else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
+                   && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) {
+            prompt_buf[prompt_buf_pos++] = '\n';
+        }
+
+        prompt_buf[prompt_buf_pos++] = key;
+        prompt_buf[prompt_buf_pos] = 0;
     }
-    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
-                 && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) {
-      prompt_buf[prompt_buf_pos++] = '\n';
+
+    /* RETURN key: execute command */
+    else if (key == '\n') {
+        wprintw(self->window, "\n");
+        execute(self, m, prompt_buf);
+        prompt_buf_pos = 0;
+        prompt_buf[0] = 0;
     }
-    prompt_buf[prompt_buf_pos++] = key;
-    prompt_buf[prompt_buf_pos] = 0;
-  }
-
-  /* RETURN key: execute command */
-  else if (key == '\n') {
-    wprintw(self->window, "\n");
-    execute(self, m, prompt_buf);
-    prompt_buf_pos = 0;
-    prompt_buf[0] = 0;
-  }
-
-  /* BACKSPACE key: Remove one character from line */
-  else if (key == 0x107 || key == 0x8 || key == 0x7f) {
-    if (prompt_buf_pos != 0) {
-      prompt_buf[--prompt_buf_pos] = 0;
+
+    /* BACKSPACE key: Remove one character from line */
+    else if (key == 0x107 || key == 0x8 || key == 0x7f) {
+        if (prompt_buf_pos != 0) {
+            prompt_buf[--prompt_buf_pos] = 0;
+        }
     }
-  }
 }
 
 static void prompt_onDraw(ToxWindow *self)
 {
-  curs_set(1);
-  int x, y;
-  getyx(self->window, y, x);
-  (void) x;
-  int i;
-  for (i = 0; i < (strlen(prompt_buf)); ++i) {
-    if ((prompt_buf[i] == '\n') && (y != 0))
-      --y;
-  }
-
-  wattron(self->window, COLOR_PAIR(1));
-  mvwprintw(self->window, y, 0, "# ");
-  wattroff(self->window, COLOR_PAIR(1));
-  mvwprintw(self->window, y, 2, "%s", prompt_buf);
-  wclrtoeol(self->window);
-  wrefresh(self->window);
+    curs_set(1);
+    int x, y;
+    getyx(self->window, y, x);
+    (void) x;
+    int i;
+
+    for (i = 0; i < (strlen(prompt_buf)); ++i) {
+        if ((prompt_buf[i] == '\n') && (y != 0))
+            --y;
+    }
+
+    wattron(self->window, COLOR_PAIR(1));
+    mvwprintw(self->window, y, 0, "# ");
+    wattroff(self->window, COLOR_PAIR(1));
+    mvwprintw(self->window, y, 2, "%s", prompt_buf);
+    wclrtoeol(self->window);
+    wrefresh(self->window);
 }
 
 static void prompt_onInit(ToxWindow *self, Messenger *m)
 {
-  scrollok(self->window, 1);
-  cmd_help(self, m, NULL);
-  wclrtoeol(self->window);
+    scrollok(self->window, 1);
+    cmd_help(self, m, NULL);
+    wclrtoeol(self->window);
 }
 
 ToxWindow new_prompt(friendAddedFn *f)
 {
-  on_friendadded_cb = f; 
-  ToxWindow ret;
-  memset(&ret, 0, sizeof(ret));
-  ret.onKey = &prompt_onKey;
-  ret.onDraw = &prompt_onDraw;
-  ret.onInit = &prompt_onInit;
-  strcpy(ret.title, "[prompt]");
-  return ret;
+    on_friendadded_cb = f;
+    ToxWindow ret;
+    memset(&ret, 0, sizeof(ret));
+    ret.onKey = &prompt_onKey;
+    ret.onDraw = &prompt_onDraw;
+    ret.onInit = &prompt_onInit;
+    strcpy(ret.title, "[prompt]");
+    return ret;
 }
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index 15caddf7..183c0f9b 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -14,232 +14,258 @@ static ToxWindow windows[MAX_WINDOW_SLOTS];
 static Messenger *m;
 int active_window;
 
-static ToxWindow* prompt;
+static ToxWindow *prompt;
 
 /* CALLBACKS START */
-void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {
-  int n = add_req(public_key);
-  wprintw(prompt->window, "\nFriend request from:\n");
+    int n = add_req(public_key);
+    wprintw(prompt->window, "\nFriend request from:\n");
 
-  int i;
-  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
-    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
-  }
+    int i;
 
-  wprintw(prompt->window, "\nWith the message: %s\n", data);
-  wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
+    for (i = 0; i < KEY_SIZE_BYTES; ++i) {
+        wprintw(prompt->window, "%02x", public_key[i] & 0xff);
+    }
+
+    wprintw(prompt->window, "\nWith the message: %s\n", data);
+    wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
 
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onFriendRequest != NULL)
-      windows[i].onFriendRequest(&windows[i], public_key, data, length);
-  }
+    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+        if (windows[i].onFriendRequest != NULL)
+            windows[i].onFriendRequest(&windows[i], public_key, data, length);
+    }
 }
 
-void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onMessage != NULL)
-      windows[i].onMessage(&windows[i], m, friendnumber, string, length);
-  }
+    int i;
+
+    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+        if (windows[i].onMessage != NULL)
+            windows[i].onMessage(&windows[i], m, friendnumber, string, length);
+    }
 }
 
-void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onAction != NULL)
-      windows[i].onAction(&windows[i], m, friendnumber, string, length);
-  }
+    int i;
+
+    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+        if (windows[i].onAction != NULL)
+            windows[i].onAction(&windows[i], m, friendnumber, string, length);
+    }
 }
 
-void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
-  wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onNickChange != NULL)
-      windows[i].onNickChange(&windows[i], friendnumber, string, length);
-  }
+    wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
+    int i;
+
+    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+        if (windows[i].onNickChange != NULL)
+            windows[i].onNickChange(&windows[i], friendnumber, string, length);
+    }
 }
 
-void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
-  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
-  int i;
-  for (i=0; i<MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onStatusChange != NULL)
-      windows[i].onStatusChange(&windows[i], friendnumber, string, length);
-  }
+    wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
+    int i;
+
+    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+        if (windows[i].onStatusChange != NULL)
+            windows[i].onStatusChange(&windows[i], friendnumber, string, length);
+    }
 }
 
 void on_friendadded(Messenger *m, int friendnumber)
 {
-  friendlist_onFriendAdded(m, friendnumber);
-  if (store_data(m, DATA_FILE) != 0) {
-      wprintw(prompt->window, "\nCould not store Messenger data\n");
-  }
+    friendlist_onFriendAdded(m, friendnumber);
+
+    if (store_data(m, DATA_FILE) != 0) {
+        wprintw(prompt->window, "\nCould not store Messenger data\n");
+    }
 }
 /* CALLBACKS END */
 
 int add_window(Messenger *m, ToxWindow w, int n)
 {
-  if (w_num >= TOXWINDOWS_MAX_NUM)
-    return -1;
+    if (w_num >= TOXWINDOWS_MAX_NUM)
+        return -1;
+
+    if (LINES < 2)
+        return -1;
 
-  if (LINES < 2)
-    return -1;
+    w.window = newwin(LINES - 2, COLS, 0, 0);
 
-  w.window = newwin(LINES - 2, COLS, 0, 0);
-  if (w.window == NULL)
-    return -1;
+    if (w.window == NULL)
+        return -1;
 
-  windows[n] = w;
-  w.onInit(&w, m);
-  w_num++;
-  active_window = n;
-  return n;
+    windows[n] = w;
+    w.onInit(&w, m);
+    w_num++;
+    active_window = n;
+    return n;
 }
 
 /* Deletes window w and cleans up */
 void del_window(ToxWindow *w, int f_num)
 {
-  active_window = 0; // Go to prompt screen
-  delwin(w->window);
-  int i;
-  for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-    if (WINDOW_STATUS[i] == f_num) {
-      WINDOW_STATUS[i] = -1;
-      disable_chatwin(f_num);
-      break;
+    active_window = 0; // Go to prompt screen
+    delwin(w->window);
+    int i;
+
+    for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+        if (WINDOW_STATUS[i] == f_num) {
+            WINDOW_STATUS[i] = -1;
+            disable_chatwin(f_num);
+            break;
+        }
     }
-  }
-  clear();
-  refresh();
+
+    clear();
+    refresh();
 }
 
 /* Shows next window when tab or back-tab is pressed */
 void set_active_window(int ch)
 {
-  int f_inf = 0;
-  int max = MAX_WINDOW_SLOTS-1;
-  if (ch == '\t') {
-    int i = (active_window + 1) % max;
-    while (true) {
-      if (WINDOW_STATUS[i] != -1) {
-        active_window = i;
-        return;
-      }
-      i = (i  + 1) % max;
-      if (f_inf++ > max) {    // infinite loop check
-        endwin();
-        exit(2);
-      }
-    }
-  }else {
-    int i = active_window - 1;
-    if (i < 0) i = max;
-    while (true) {
-      if (WINDOW_STATUS[i] != -1) {
-        active_window = i;
-        return;
-      }
-      if (--i < 0) i = max;
-      if (f_inf++ > max) {
-        endwin();
-        exit(2);
-      }
+    int f_inf = 0;
+    int max = MAX_WINDOW_SLOTS - 1;
+
+    if (ch == '\t') {
+        int i = (active_window + 1) % max;
+
+        while (true) {
+            if (WINDOW_STATUS[i] != -1) {
+                active_window = i;
+                return;
+            }
+
+            i = (i  + 1) % max;
+
+            if (f_inf++ > max) {    // infinite loop check
+                endwin();
+                exit(2);
+            }
+        }
+    } else {
+        int i = active_window - 1;
+
+        if (i < 0) i = max;
+
+        while (true) {
+            if (WINDOW_STATUS[i] != -1) {
+                active_window = i;
+                return;
+            }
+
+            if (--i < 0) i = max;
+
+            if (f_inf++ > max) {
+                endwin();
+                exit(2);
+            }
+        }
     }
-  }
 }
 
 void init_window_status()
 {
-  /* Default window values decrement from -2 */
-  int i;
-  for (i = 0; i < N_DEFAULT_WINS; ++i)
-    WINDOW_STATUS[i] = -(i+2);
-
-  int j;
-  for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
-    WINDOW_STATUS[j] = -1;
+    /* Default window values decrement from -2 */
+    int i;
+
+    for (i = 0; i < N_DEFAULT_WINS; ++i)
+        WINDOW_STATUS[i] = -(i + 2);
+
+    int j;
+
+    for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
+        WINDOW_STATUS[j] = -1;
 }
 
 ToxWindow *init_windows()
 {
-  w_num = 0;
-  int n_prompt = 0;
-  int n_friendslist = 1;
-  int n_dhtstatus = 2;
-  if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
-                        || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
-                        || add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
-    fprintf(stderr, "add_window() failed.\n");
-    endwin();
-    exit(1);
-  }
-  active_window = n_prompt;
-  prompt = &windows[n_prompt];
-  return prompt;
+    w_num = 0;
+    int n_prompt = 0;
+    int n_friendslist = 1;
+    int n_dhtstatus = 2;
+
+    if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
+            || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
+            || add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
+        fprintf(stderr, "add_window() failed.\n");
+        endwin();
+        exit(1);
+    }
+
+    active_window = n_prompt;
+    prompt = &windows[n_prompt];
+    return prompt;
 }
 
 static void draw_bar()
 {
-  static int odd = 0;
-  int blinkrate = 30;
+    static int odd = 0;
+    int blinkrate = 30;
+
+    attron(COLOR_PAIR(4));
+    mvhline(LINES - 2, 0, '_', COLS);
+    attroff(COLOR_PAIR(4));
+
+    move(LINES - 1, 0);
+
+    attron(COLOR_PAIR(4) | A_BOLD);
+    printw(" TOXIC " TOXICVER "|");
+    attroff(COLOR_PAIR(4) | A_BOLD);
 
-  attron(COLOR_PAIR(4));
-  mvhline(LINES - 2, 0, '_', COLS);
-  attroff(COLOR_PAIR(4));
+    int i;
 
-  move(LINES - 1, 0);
+    for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
+        if (WINDOW_STATUS[i] != -1) {
+            if (i == active_window)
+                attron(A_BOLD);
 
-  attron(COLOR_PAIR(4) | A_BOLD);
-  printw(" TOXIC " TOXICVER "|");
-  attroff(COLOR_PAIR(4) | A_BOLD);
+            odd = (odd + 1) % blinkrate;
 
-  int i;
-  for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
-    if (WINDOW_STATUS[i] != -1) {
-      if (i == active_window)
-        attron(A_BOLD);
+            if (windows[i].blink && (odd < (blinkrate / 2)))
+                attron(COLOR_PAIR(3));
 
-      odd = (odd+1) % blinkrate;
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attron(COLOR_PAIR(3));
+            printw(" %s", windows[i].title);
 
-      printw(" %s", windows[i].title);
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attroff(COLOR_PAIR(3));
+            if (windows[i].blink && (odd < (blinkrate / 2)))
+                attroff(COLOR_PAIR(3));
 
-      if (i == active_window) {
-        attroff(A_BOLD);
-      }
+            if (i == active_window) {
+                attroff(A_BOLD);
+            }
+        }
     }
-  }
-  refresh();
+
+    refresh();
 }
 
 void prepare_window(WINDOW *w)
 {
-  mvwin(w, 0, 0);
-  wresize(w, LINES-2, COLS);
+    mvwin(w, 0, 0);
+    wresize(w, LINES - 2, COLS);
 }
 
 void draw_active_window(Messenger *m)
 {
 
-  ToxWindow *a = &windows[active_window];
-  prepare_window(a->window);
-  a->blink = false;
-  draw_bar();
-  a->onDraw(a);
-
-  /* Handle input */
-  int ch = getch();
-  if (ch == '\t' || ch == KEY_BTAB)
-    set_active_window(ch);
-  else if (ch != ERR)
-    a->onKey(a, m, ch);
+    ToxWindow *a = &windows[active_window];
+    prepare_window(a->window);
+    a->blink = false;
+    draw_bar();
+    a->onDraw(a);
+
+    /* Handle input */
+    int ch = getch();
+
+    if (ch == '\t' || ch == KEY_BTAB)
+        set_active_window(ch);
+    else if (ch != ERR)
+        a->onKey(a, m, ch);
 }
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 9f4d74a2..553a6200 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -26,31 +26,31 @@
 typedef struct ToxWindow_ ToxWindow;
 
 struct ToxWindow_ {
-  void(*onKey)(ToxWindow*, Messenger*, int);
-  void(*onDraw)(ToxWindow*);
-  void(*onInit)(ToxWindow*, Messenger*);
-  void(*onFriendRequest)(ToxWindow*, uint8_t*, uint8_t*, uint16_t);
-  void(*onMessage)(ToxWindow*, Messenger*, int, uint8_t*, uint16_t);
-  void(*onNickChange)(ToxWindow*, int, uint8_t*, uint16_t);
-  void(*onStatusChange)(ToxWindow*, int, uint8_t*, uint16_t);
-  void(*onAction)(ToxWindow*, Messenger*, int, uint8_t*, uint16_t);
-  char title[256];
-
-  void* x;
-  bool blink;
-
-  WINDOW* window;
+    void(*onKey)(ToxWindow *, Messenger *, int);
+    void(*onDraw)(ToxWindow *);
+    void(*onInit)(ToxWindow *, Messenger *);
+    void(*onFriendRequest)(ToxWindow *, uint8_t *, uint8_t *, uint16_t);
+    void(*onMessage)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);
+    void(*onNickChange)(ToxWindow *, int, uint8_t *, uint16_t);
+    void(*onStatusChange)(ToxWindow *, int, uint8_t *, uint16_t);
+    void(*onAction)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);
+    char title[256];
+
+    void *x;
+    bool blink;
+
+    WINDOW *window;
 };
 
-void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata);
-void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
-void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
-void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
-void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata);
+void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
+void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void on_friendadded(Messenger *m, int friendnumber);
 void init_window_status();
-ToxWindow * init_windows();
-void draw_active_window(Messenger * m);
+ToxWindow *init_windows();
+void draw_active_window(Messenger *m);
 int add_window(Messenger *m, ToxWindow w, int n);
 void del_window(ToxWindow *w, int f_num);
 void set_active_window(int ch);