diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 360e94c8eb..3863849df4 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -1,5 +1,5 @@
 SRC = shell_commands.c sc_id.c sc_heap.c
-INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/ 
+INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
 
 ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
diff --git a/sys/shell/commands/sc_heap.c b/sys/shell/commands/sc_heap.c
index b8e1477084..e00085c429 100644
--- a/sys/shell/commands/sc_heap.c
+++ b/sys/shell/commands/sc_heap.c
@@ -2,23 +2,24 @@
  * sc_heap.c - the handler of the heap state on the command shell.
  * Copyright (C) 2013 Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  *
- * The source code is licensed under the LGPLv2 license, See the file LICENSE for more details.
+ * The source code is licensed under the LGPLv2 license,
+ * See the file LICENSE for more details.
  */
 
 /**
  * @file
  * @internal
- * @brief		Show the heap state for the LPC2387 on the command shell.
+ * @brief   Show the heap state for the LPC2387 on the command shell.
  *
  * @author      Freie Universität Berlin, Computer Systems & Telematics
- * @author		Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
+ * @author  Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  *
- * @note		$Id: sc_heap.c  3854 2013-05-24 17:53:01Z zkasmi $
+ * @note    $Id: sc_heap.c  3854 2013-05-24 17:53:01Z zkasmi $
  */
 
 extern void heap_stats(void);
 
 void _heap_handler(char* unnused){
-	heap_stats();
+    heap_stats();
 }
 
diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c
index 8e0352bd19..64a4ba8dc0 100644
--- a/sys/shell/commands/shell_commands.c
+++ b/sys/shell/commands/shell_commands.c
@@ -3,8 +3,10 @@
  *
  * Copyright (C) 2013  INRIA.
  *
- * The source code is licensed under the LGPLv2 license, 
- * see the file LICENSE for more details.
+ * This file subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ *
  *
  * @ingroup shell_commands
  * @{
@@ -18,8 +20,6 @@
 #include <shell_commands.h>
 #include <stdlib.h>
 
-
-
 extern void _id_handler(char* id);
 extern void _heap_handler(char* unused);