diff --git a/MCGalaxy/Commands/Alias.cs b/MCGalaxy/Commands/Alias.cs
index b468b86cd..656654566 100644
--- a/MCGalaxy/Commands/Alias.cs
+++ b/MCGalaxy/Commands/Alias.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace MCGalaxy.Commands {
-    
-    public class Alias {
-        
+namespace MCGalaxy.Commands 
+{  
+    public class Alias 
+    {
         public static List<Alias> coreAliases = new List<Alias>();
         public static List<Alias> aliases = new List<Alias>();
         public string Trigger, Target, Format;
diff --git a/MCGalaxy/Commands/Information/CmdCommands.cs b/MCGalaxy/Commands/Information/CmdCommands.cs
index bf94ba0f9..1fe267a0f 100644
--- a/MCGalaxy/Commands/Information/CmdCommands.cs
+++ b/MCGalaxy/Commands/Information/CmdCommands.cs
@@ -45,7 +45,7 @@ namespace MCGalaxy.Commands.Info {
 
             string type = args[0].ToLower();
             if (type == "short" || type == "shortcut" || type == "shortcuts") {
-                 PrintShortcuts(p, sort);
+                 PrintShortcuts(p, modifier);
             } else if (type == "old" || type == "oldmenu" || type == "" || type == "command") {
                  PrintRankCommands(p, sort, modifier, p.group, true);
             } else if (type == "all" || type == "commandall" || type == "commandsall") {
diff --git a/MCGalaxy/Entity/Entities.cs b/MCGalaxy/Entity/Entities.cs
index 3e7ea5fcb..e7926d1d8 100644
--- a/MCGalaxy/Entity/Entities.cs
+++ b/MCGalaxy/Entity/Entities.cs
@@ -16,14 +16,12 @@ using System;
 using MCGalaxy.Events.EntityEvents;
 using MCGalaxy.Games;
 using MCGalaxy.Network;
-using MCGalaxy.Maths;
-using BlockID = System.UInt16;
-
-namespace MCGalaxy {
 
+namespace MCGalaxy 
+{
     /// <summary> Contains methods related to the management of entities (such as players). </summary>
-    public static class Entities {
-
+    public static class Entities 
+    {
         public const byte SelfID = 0xFF;
         public const ushort CharacterHeight = 51;
         
diff --git a/MCGalaxy/Entity/Entity.cs b/MCGalaxy/Entity/Entity.cs
index 38cc0a6e6..730c32052 100644
--- a/MCGalaxy/Entity/Entity.cs
+++ b/MCGalaxy/Entity/Entity.cs
@@ -17,12 +17,12 @@
  */
 using System;
 using System.Threading;
-using MCGalaxy.Events.EntityEvents;
 using MCGalaxy.Maths;
 
-namespace MCGalaxy {
-    public abstract class Entity {
-        
+namespace MCGalaxy 
+{
+    public abstract class Entity 
+    {
         // Raw orientation/position - access must be threadsafe
         volatile uint _rot;
         long _pos;
diff --git a/MCGalaxy/Entity/ModelInfo.cs b/MCGalaxy/Entity/ModelInfo.cs
index 370072647..63a40ff57 100644
--- a/MCGalaxy/Entity/ModelInfo.cs
+++ b/MCGalaxy/Entity/ModelInfo.cs
@@ -17,14 +17,13 @@
  */
 using System;
 using System.Collections.Generic;
-using MCGalaxy.Blocks;
 using MCGalaxy.Maths;
 using BlockID = System.UInt16;
 
-namespace MCGalaxy {
-    
-    public struct ModelInfo {
-        
+namespace MCGalaxy 
+{ 
+    public struct ModelInfo 
+    {
         public readonly string Model;
         public readonly Vec3S32 BaseSize;
         public readonly int EyeHeight;
diff --git a/MCGalaxy/Entity/Structs.cs b/MCGalaxy/Entity/Structs.cs
index d2b3433ec..d08f02511 100644
--- a/MCGalaxy/Entity/Structs.cs
+++ b/MCGalaxy/Entity/Structs.cs
@@ -18,11 +18,11 @@
 using System;
 using MCGalaxy.Maths;
 
-namespace MCGalaxy {
-    
+namespace MCGalaxy 
+{  
     /// <summary> Represents the position of an entity in the world. </summary>
-    public struct Position : IEquatable<Position> {
-        
+    public struct Position : IEquatable<Position> 
+    {       
         /// <summary> X fixed-point location in the world. </summary>
         public int X;
         
diff --git a/MCGalaxy/Entity/TabList.cs b/MCGalaxy/Entity/TabList.cs
index b8ca4765a..f847dd708 100644
--- a/MCGalaxy/Entity/TabList.cs
+++ b/MCGalaxy/Entity/TabList.cs
@@ -16,14 +16,14 @@
     permissions and limitations under the Licenses.
  */
 using System;
-using MCGalaxy.Games;
 using MCGalaxy.Events.EntityEvents;
 using MCGalaxy.Network;
 
-namespace MCGalaxy {
-
+namespace MCGalaxy 
+{
     /// <summary> Contains methods related to the management of tab list of player names. </summary>
-    public static class TabList {
+    public static class TabList 
+    {
          // Want nobody to be at top of list, banned to be bottom of list.
         const LevelPermission offset = LevelPermission.Nobody;