diff --git a/Commands/Moderation/CmdBan.cs b/Commands/Moderation/CmdBan.cs
index 69f0bdadc..fab78e5bb 100644
--- a/Commands/Moderation/CmdBan.cs
+++ b/Commands/Moderation/CmdBan.cs
@@ -17,10 +17,8 @@
  */
 using System;
 
-namespace MCGalaxy.Commands {
-    
-    public sealed class CmdBan : Command {
-        
+namespace MCGalaxy.Commands.Moderation {    
+    public sealed class CmdBan : Command {        
         public override string name { get { return "ban"; } }
         public override string shortcut { get { return ""; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdBanEdit.cs b/Commands/Moderation/CmdBanEdit.cs
index 55188bdc9..1fc93f848 100644
--- a/Commands/Moderation/CmdBanEdit.cs
+++ b/Commands/Moderation/CmdBanEdit.cs
@@ -15,10 +15,8 @@
 	or implied. See the Licenses for the specific language governing
 	permissions and limitations under the Licenses.
 */
-namespace MCGalaxy.Commands {
-	
-    public sealed class CmdBanEdit : Command {
-		
+namespace MCGalaxy.Commands.Moderation {
+	public sealed class CmdBanEdit : Command {
         public override string name { get { return "banedit"; } }
         public override string shortcut { get { return "be"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdBaninfo.cs b/Commands/Moderation/CmdBaninfo.cs
index 35bd53934..93fdb243e 100644
--- a/Commands/Moderation/CmdBaninfo.cs
+++ b/Commands/Moderation/CmdBaninfo.cs
@@ -15,10 +15,8 @@
     or implied. See the Licenses for the specific language governing
     permissions and limitations under the Licenses.
  */
-namespace MCGalaxy.Commands
-{
-    public sealed class CmdBaninfo : Command
-    {
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdBaninfo : Command {
         public override string name { get { return "baninfo"; } }
         public override string shortcut { get { return ""; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdBanip.cs b/Commands/Moderation/CmdBanip.cs
index 9edbaf64a..81cabd09a 100644
--- a/Commands/Moderation/CmdBanip.cs
+++ b/Commands/Moderation/CmdBanip.cs
@@ -21,7 +21,7 @@ using System.Data;
 using System.Linq;
 using MCGalaxy.SQL;
 
-namespace MCGalaxy.Commands {
+namespace MCGalaxy.Commands.Moderation {
     public sealed class CmdBanip : Command {
         public override string name { get { return "banip"; } }
         public override string shortcut { get { return "bi"; } }
diff --git a/Commands/Moderation/CmdBanlist.cs b/Commands/Moderation/CmdBanlist.cs
index 2002381f0..e7ddbf49d 100644
--- a/Commands/Moderation/CmdBanlist.cs
+++ b/Commands/Moderation/CmdBanlist.cs
@@ -18,10 +18,8 @@
 using System.IO;
 using System.Text;
 
-namespace MCGalaxy.Commands
-{
-    public sealed class CmdBanlist : Command
-    {
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdBanlist : Command {
         public override string name { get { return "banlist"; } }
         public override string shortcut { get { return "bl"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdDelTempRank.cs b/Commands/Moderation/CmdDelTempRank.cs
index b69b560a2..340253886 100644
--- a/Commands/Moderation/CmdDelTempRank.cs
+++ b/Commands/Moderation/CmdDelTempRank.cs
@@ -16,8 +16,7 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace MCGalaxy.Commands {
-    
+namespace MCGalaxy.Commands.Moderation {    
     public sealed class CmdDelTempRank : Command {
         public override string name { get { return "deltemprank"; } }
         public override string shortcut { get { return "dtr"; } }
diff --git a/Commands/Moderation/CmdDemote.cs b/Commands/Moderation/CmdDemote.cs
index 7badb30ad..f8aaf48f6 100644
--- a/Commands/Moderation/CmdDemote.cs
+++ b/Commands/Moderation/CmdDemote.cs
@@ -1,9 +1,7 @@
 using System;
 
-namespace MCGalaxy.Commands {
-
+namespace MCGalaxy.Commands.Moderation {
     public class CmdDemote : Command {
-
         public override string name { get { return "demote"; } }
         public override string shortcut { get { return "de"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdMute.cs b/Commands/Moderation/CmdMute.cs
index 255854f95..25a6efbb5 100644
--- a/Commands/Moderation/CmdMute.cs
+++ b/Commands/Moderation/CmdMute.cs
@@ -18,13 +18,11 @@
 using System;
 using System.IO;
 
-namespace MCGalaxy.Commands
-{
-    public sealed class CmdMute : Command
-    {
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdMute : Command {
         public override string name { get { return "mute"; } }
         public override string shortcut { get { return ""; } }
-       public override string type { get { return CommandTypes.Moderation; } }
+        public override string type { get { return CommandTypes.Moderation; } }
         public override bool museumUsable { get { return true; } }
         public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
         public CmdMute() { }
diff --git a/Commands/Moderation/CmdPromote.cs b/Commands/Moderation/CmdPromote.cs
index e8b6883ec..54ddc1559 100644
--- a/Commands/Moderation/CmdPromote.cs
+++ b/Commands/Moderation/CmdPromote.cs
@@ -1,9 +1,7 @@
 using System;
 
-namespace MCGalaxy.Commands {
-
+namespace MCGalaxy.Commands.Moderation {
     public class CmdPromote : Command {
-
         public override string name { get { return "promote"; } }
         public override string shortcut { get { return "pr"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdSetRank.cs b/Commands/Moderation/CmdSetRank.cs
index 10838642b..004c80a4a 100644
--- a/Commands/Moderation/CmdSetRank.cs
+++ b/Commands/Moderation/CmdSetRank.cs
@@ -17,10 +17,8 @@
  */
 using System;
 using System.IO;
-namespace MCGalaxy.Commands
-{
-    public sealed class CmdSetRank : Command
-    {
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdSetRank : Command {
         public override string name { get { return "setrank"; } }
         public override string shortcut { get { return "rank"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdTempBan.cs b/Commands/Moderation/CmdTempBan.cs
index 8072ea928..393700931 100644
--- a/Commands/Moderation/CmdTempBan.cs
+++ b/Commands/Moderation/CmdTempBan.cs
@@ -17,10 +17,8 @@
  */
 using System;
 
-namespace MCGalaxy.Commands {
-    
-    public sealed class CmdTempBan : Command {
-        
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdTempBan : Command {       
         public override string name { get { return "tempban"; } }
         public override string shortcut { get { return "tb"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdTempRank.cs b/Commands/Moderation/CmdTempRank.cs
index 7ed3b5c80..1b9f8376b 100644
--- a/Commands/Moderation/CmdTempRank.cs
+++ b/Commands/Moderation/CmdTempRank.cs
@@ -15,10 +15,8 @@ permissions and limitations under the Licenses.
 using System;
 using System.IO;
 
-namespace MCGalaxy.Commands {
-    
-    public sealed class CmdTempRank : Command {
-        
+namespace MCGalaxy.Commands.Moderation {   
+    public sealed class CmdTempRank : Command {       
         public override string name { get { return "temprank"; } }
         public override string shortcut { get { return "tr"; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdTempRankInfo.cs b/Commands/Moderation/CmdTempRankInfo.cs
index eb3ac8f0a..3c7987f85 100644
--- a/Commands/Moderation/CmdTempRankInfo.cs
+++ b/Commands/Moderation/CmdTempRankInfo.cs
@@ -15,9 +15,8 @@ permissions and limitations under the Licenses.
 using System;
 using System.IO;
 
-namespace MCGalaxy.Commands {
-    public sealed class CmdTempRankInfo : Command {
-        
+namespace MCGalaxy.Commands.Moderation {
+    public sealed class CmdTempRankInfo : Command {       
         public override string name { get { return "temprankinfo"; } }
         public override string shortcut { get { return ""; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdTempRankList.cs b/Commands/Moderation/CmdTempRankList.cs
index bf4456aa5..3c65de1ab 100644
--- a/Commands/Moderation/CmdTempRankList.cs
+++ b/Commands/Moderation/CmdTempRankList.cs
@@ -13,8 +13,8 @@ or implied. See the Licenses for the specific language governing
 permissions and limitations under the Licenses.
 */
 using System.IO;
-namespace MCGalaxy.Commands {
-    
+
+namespace MCGalaxy.Commands.Moderation {   
     public sealed class CmdTempRankList : Command {        
         public override string name { get { return "tempranklist"; } }
         public override string shortcut { get { return "trl"; } }
diff --git a/Commands/Moderation/CmdUnbanip.cs b/Commands/Moderation/CmdUnbanip.cs
index beb6b3653..7352f3098 100644
--- a/Commands/Moderation/CmdUnbanip.cs
+++ b/Commands/Moderation/CmdUnbanip.cs
@@ -56,14 +56,11 @@ namespace MCGalaxy.Commands
             if (!Server.bannedIP.Contains(message)) { Player.Message(p, message + " doesn't seem to be banned..."); return; }
             Server.bannedIP.Remove(message); Server.bannedIP.Save("banned-ip.txt", false);
 
-            if (p != null)
-            {
+            if (p != null) {
                 Server.IRC.Say(message.ToLower() + " was un-ip-banned by " + p.name + ".");
                 Server.s.Log("IP-UNBANNED: " + message.ToLower() + " by " + p.name + ".");
                 Player.GlobalMessage(message + " was &8un-ip-banned %Sby " + p.ColoredName + "%S.");
-            }
-            else
-            {
+            } else {
                 Server.IRC.Say(message.ToLower() + " was un-ip-banned by (console).");
                 Server.s.Log("IP-UNBANNED: " + message.ToLower() + " by (console).");
                 Player.GlobalMessage(message + " was &8un-ip-banned %Sby (console).");
diff --git a/Commands/Moderation/CmdWarn.cs b/Commands/Moderation/CmdWarn.cs
index 7808affbd..86244e8c4 100644
--- a/Commands/Moderation/CmdWarn.cs
+++ b/Commands/Moderation/CmdWarn.cs
@@ -15,10 +15,8 @@
     or implied. See the Licenses for the specific language governing
     permissions and limitations under the Licenses.
 */
-namespace MCGalaxy.Commands {
-    
-    public sealed class CmdWarn : Command {
-        
+namespace MCGalaxy.Commands.Moderation {    
+    public sealed class CmdWarn : Command {        
         public override string name { get { return "warn"; } }
         public override string shortcut { get { return ""; } }
         public override string type { get { return CommandTypes.Moderation; } }
diff --git a/Commands/Moderation/CmdXban.cs b/Commands/Moderation/CmdXban.cs
index 26bd469f9..baa21e529 100644
--- a/Commands/Moderation/CmdXban.cs
+++ b/Commands/Moderation/CmdXban.cs
@@ -15,10 +15,8 @@
     or implied. See the Licenses for the specific language governing
     permissions and limitations under the Licenses.
 */
-namespace MCGalaxy.Commands {
-    
-    public sealed class CmdXban : Command {
-        
+namespace MCGalaxy.Commands.Moderation {   
+    public sealed class CmdXban : Command {       
         public override string name { get { return "xban"; } }
         public override string shortcut { get { return "banx"; } }
         public override string type { get { return CommandTypes.Moderation; } }
@@ -32,13 +30,14 @@ namespace MCGalaxy.Commands {
             string name = message.Split(' ')[0];
             Player who = PlayerInfo.Find(name);
             Command.all.Find("ban").Use(p, message);
+            Command.all.Find("banip").Use(p, "@" + name);
             if (who != null)
                 Command.all.Find("kick").Use(p, message);
             Command.all.Find("undo").Use(p, name + " all");
         }
 
         public override void Help(Player p) {
-            Player.Message(p, "/xban [name] [message]- Bans, undoes, and kicks [name] with [message], if specified.");
+            Player.Message(p, "/xban [name] [message]- Bans, IP bans, undoes, and kicks [name] with [message], if specified.");
         }
     }
 }