diff --git a/core/msg.c b/core/msg.c
index de377ab730..8f6313f685 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -99,7 +99,7 @@ int msg_send(msg_t *m, unsigned int target_pid, bool block)
             newstatus = STATUS_SEND_BLOCKED;
         }
 
-        sched_set_status((tcb_t*) active_thread,  newstatus);
+        sched_set_status((tcb_t*) active_thread, newstatus);
 
         DEBUG("msg_send: %s: Back from send block.\n", active_thread->name);
     }
@@ -108,7 +108,7 @@ int msg_send(msg_t *m, unsigned int target_pid, bool block)
         /* copy msg to target */
         msg_t *target_message = (msg_t*) target->wait_data;
         *target_message = *m;
-        sched_set_status(target,  STATUS_PENDING);
+        sched_set_status(target, STATUS_PENDING);
     }
 
     eINT();
@@ -129,7 +129,7 @@ int msg_send_int(msg_t *m, unsigned int target_pid)
         /* copy msg to target */
         msg_t *target_message = (msg_t*) target->wait_data;
         *target_message = *m;
-        sched_set_status(target,  STATUS_PENDING);
+        sched_set_status(target, STATUS_PENDING);
 
         sched_context_switch_request = 1;
         return 1;
@@ -144,7 +144,7 @@ int msg_send_receive(msg_t *m, msg_t *reply, unsigned int target_pid)
 {
     dINT();
     tcb_t *me = (tcb_t*) sched_threads[thread_pid];
-    sched_set_status(me,  STATUS_REPLY_BLOCKED);
+    sched_set_status(me, STATUS_REPLY_BLOCKED);
     me->wait_data = (void*) reply;
 
     /* msg_send blocks until reply received */
@@ -173,7 +173,7 @@ int msg_reply(msg_t *m, msg_t *reply)
     /* copy msg to target */
     msg_t *target_message = (msg_t*) target->wait_data;
     *target_message = *reply;
-    sched_set_status(target,  STATUS_PENDING);
+    sched_set_status(target, STATUS_PENDING);
     restoreIRQ(state);
     thread_yield();
 
@@ -191,7 +191,7 @@ int msg_reply_int(msg_t *m, msg_t *reply)
 
     msg_t *target_message = (msg_t*) target->wait_data;
     *target_message = *reply;
-    sched_set_status(target,  STATUS_PENDING);
+    sched_set_status(target, STATUS_PENDING);
     sched_context_switch_request = 1;
     return 1;
 }
@@ -239,7 +239,7 @@ static int _msg_receive(msg_t *m, int block)
 
         if (queue_index < 0) {
             DEBUG("_msg_receive(): %s: No msg in queue. Going blocked.\n", active_thread->name);
-            sched_set_status(me,  STATUS_RECEIVE_BLOCKED);
+            sched_set_status(me, STATUS_RECEIVE_BLOCKED);
 
             eINT();
             thread_yield();
@@ -254,7 +254,7 @@ static int _msg_receive(msg_t *m, int block)
         tcb_t *sender = (tcb_t*) node->data;
 
         if (queue_index >= 0) {
-            /* We've already got a message from the queue.  As there is a
+            /* We've already got a message from the queue. As there is a
              * waiter, take it's message into the just freed queue space.
              */
             m = &(me->msg_array[cib_put(&(me->msg_queue))]);
@@ -266,7 +266,7 @@ static int _msg_receive(msg_t *m, int block)
 
         /* remove sender from queue */
         sender->wait_data = NULL;
-        sched_set_status(sender,  STATUS_PENDING);
+        sched_set_status(sender, STATUS_PENDING);
 
         eINT();
         return 1;