diff --git a/src/commands/comsys.py b/src/commands/comsys.py
index 22f8d2ed3f..e79aef7dd3 100644
--- a/src/commands/comsys.py
+++ b/src/commands/comsys.py
@@ -129,15 +129,15 @@ def cmd_clist(command):
     session = command.session
     source_object = command.source_object
     
-    source_object.emit_to("** Channel       Owner         Description")
+    source_object.emit_to("** Channel        Owner         Description")
     for chan in src.comsys.get_all_channels():
-        source_object.emit_to("%s%s %-14.13s%-22.15s%s" %
+        source_object.emit_to("%s%s %-15.14s%-22.15s%s" %
             ('-', 
              '-', 
              chan.get_name(), 
              chan.get_owner().get_name(show_dbref=False), 
              chan.description))
-    source_object.emit_to("-- End of Channel List --")
+    source_object.emit_to("** End of Channel List **")
 GLOBAL_CMD_TABLE.add_command("@clist", cmd_clist),
 
 def cmd_cdestroy(command):
diff --git a/src/initial_setup.py b/src/initial_setup.py
index 40193f45a0..dd8148ead6 100644
--- a/src/initial_setup.py
+++ b/src/initial_setup.py
@@ -63,7 +63,8 @@ def create_channels():
     Creates some sensible default channels.
     """
     god_user_obj = get_god_obj()
-    chan_pub = comsys.create_channel("Public", god_user_obj, description="Public Discussion")
+    chan_pub = comsys.create_channel("Public", god_user_obj, 
+                                     description="Public Discussion")
     chan_pub.is_joined_by_default = True
     chan_pub.save()
     comsys.create_channel(settings.COMMCHAN_MUD_INFO, god_user_obj,