diff --git a/p/daemon/channel.h b/p/daemon/channel.h
index ad1f506..9b2efc5 100644
--- a/p/daemon/channel.h
+++ b/p/daemon/channel.h
@@ -5,39 +5,38 @@
 #ifndef __DAEMON_CHANNEL_H__
 #define __DAEMON_CHANNEL_H__
 
-#define P_CHANNELS		"channels"
-#define P_STD_CHANNEL		"std_channel"
+#define P_CHANNELS        "channels"
+#define P_STD_CHANNEL     "std_channel"
 
-#define CHMASTER		"/p/daemon/channeld"
+#define CHMASTER          "/p/daemon/channeld"
 
 // Message types
-#define MSG_SAY                 0
-#define MSG_EMOTE               1
-#define MSG_GEMOTE              2
-#define MSG_EMPTY               3
+#define MSG_SAY           0
+#define MSG_EMOTE         1
+#define MSG_GEMOTE        2
+#define MSG_EMPTY         3
 
 // Errors
-#define E_ACCESS_DENIED         -1
-#define E_ALREADY_JOINED        -2
-#define E_NOT_MEMBER            -3
-#define E_EMPTY_MESSAGE         -4
-#define E_UNKNOWN_TYPE          -5
+#define E_ACCESS_DENIED  -1
+#define E_ALREADY_JOINED -2
+#define E_NOT_MEMBER     -3
+#define E_EMPTY_MESSAGE  -4
+#define E_UNKNOWN_TYPE   -5
 
 // Commands
-#define C_NEW			"new"
-#define C_JOIN			"join"
-#define C_LEAVE			"leave"
-#define C_SEND			"send"
-#define C_LIST			"list"
-#define C_FIND			"find"
+#define C_NEW	            "new"
+#define C_JOIN            "join"
+#define C_LEAVE           "leave"
+#define C_SEND            "send"
+#define C_LIST            "list"
+#define C_FIND            "find"
 
-// definition of the list mapping entry 
-// ([ channelname : ({ I_MEMBER, I_ACCESS, I_INFO, I_MASTER, I_NAME }) ])
-#define I_MEMBER                0
-#define I_ACCESS                1
-#define I_INFO                  2
-#define I_MASTER		3
-#define I_NAME			4
+// definition of the channel list entry indices
+#define I_MEMBER          0
+#define I_ACCESS          1
+#define I_INFO            2
+#define I_MASTER          3
+#define I_NAME            4
 
 #endif //__DAEMON_CHANNEL_H__
 
@@ -56,4 +55,3 @@
 #endif //__CHANNEL_H_PROTO__
 
 #endif //NEED_PROTOTYPES
-