diff --git a/src/device.c b/src/device.c
index 32f6129..223ca38 100644
--- a/src/device.c
+++ b/src/device.c
@@ -215,7 +215,7 @@ DeviceError open_device(DeviceType type, int32_t selection, uint32_t* device_idx
     const uint32_t frame_size = (sample_rate * frame_duration / 1000);
     
     uint32_t i;
-    for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; i ++);
+    for (i = 0; i < MAX_DEVICES && running[type][i] != NULL; ++i);
     
     if (i == MAX_DEVICES) { unlock; return de_AllDevicesBusy; }
     else *device_idx = i;
@@ -384,10 +384,10 @@ inline__ DeviceError write_out(uint32_t device_idx, const int16_t* data, uint32_
     
     alBufferData(bufid, device->sound_mode, data, length * 2 * channels, device->sample_rate);
     alSourceQueueBuffers(device->source, 1, &bufid);
-    
+
     ALint state;
     alGetSourcei(device->source, AL_SOURCE_STATE, &state);
-    
+
     if(state != AL_PLAYING) alSourcePlay(device->source);
 
 
diff --git a/src/groupchat.c b/src/groupchat.c
index 1b9e0e4..aa150f4 100644
--- a/src/groupchat.c
+++ b/src/groupchat.c
@@ -399,8 +399,7 @@ void *group_add_wait(void *data)
     pthread_exit(NULL);
 }
 
-static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum,
-                                            uint8_t change)
+static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnum, int peernum, uint8_t change)
 {
     if (self->num != groupnum)
         return;
@@ -716,6 +715,8 @@ static void groupchat_onInit(ToxWindow *self, Tox *m)
 void groupchat_onWriteDevice(ToxWindow *self, Tox *m, int groupnum, int peernum, const int16_t *pcm, 
                              unsigned int samples, uint8_t channels, unsigned int sample_rate)
 {
+    return;    /* TODO: remove this */
+
     if (groupnum != self->num)
         return;