diff --git a/guild2.py b/guild2.py
index f50ac86..a686574 100644
--- a/guild2.py
+++ b/guild2.py
@@ -65,10 +65,7 @@ async def on_message(message):
     if message.author.name != client.user.name:
         if message.content == "":
             return
-        if message.author == None:
-            print(YELLOW + "Gil ("+message.channel.name+"@"+message.server.name+")> "+RESET+message.content)
-        else:
-            print(YELLOW + "<"+message.author.name+" ("+message.channel.name+"@"+message.server.name+ " {" + message.server.id +"})> "+RESET+message.content)
+        print(YELLOW + "<"+message.author.name if message.author != None else "Gil" +" ("+message.channel.name+"@"+message.server.name+ " {" + message.server.id +"})> "+RESET+message.content)
         if message.author.name == client.user.name or message.author.bot:
             return
         elif message.content[0] == "$":