diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
index 9c9feb891..01bbb8d20 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java
@@ -14,141 +14,129 @@ import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.entity.EntityNPCInterface;
 import org.lwjgl.input.Keyboard;
 
-public class GuiNpcMenu implements GuiYesNoCallback{
-	
-	private GuiScreen parent;
-	private GuiMenuTopButton[] topButtons;
+public class GuiNpcMenu implements GuiYesNoCallback {
 
-	private int activeMenu;
-	private EntityNPCInterface npc;
-	public boolean saveNPC = true;
+    private GuiScreen parent;
+    public GuiMenuTopButton[] topButtons;
 
-	public GuiNpcMenu(GuiScreen parent, int activeMenu, EntityNPCInterface npc) {
-		this.parent = parent;
-		this.activeMenu = activeMenu;
-		this.npc = npc;
-	}
+    private int activeMenu;
+    private EntityNPCInterface npc;
+    public boolean saveNPC = true;
 
-    public void initGui(int guiLeft, int guiTop, int width)
-    {        
+    public GuiNpcMenu(GuiScreen parent, int activeMenu, EntityNPCInterface npc) {
+        this.parent = parent;
+        this.activeMenu = activeMenu;
+        this.npc = npc;
+    }
+
+    public void initGui(int guiLeft, int guiTop, int width) {
         Keyboard.enableRepeatEvents(true);
 
-		GuiMenuTopButton close = new GuiMenuTopButton(0,guiLeft + width - 22, guiTop - 17, "X");
-		if (npc != null) {
-			GuiMenuTopButton display = new GuiMenuTopButton(1, guiLeft + 4, guiTop - 17, "menu.display");
-			GuiMenuTopButton stats = new GuiMenuTopButton(2, display.xPosition + display.getWidth(), guiTop - 17, "menu.stats");
-			GuiMenuTopButton ai = new GuiMenuTopButton(6, stats.xPosition + stats.getWidth(), guiTop - 17, "menu.ai");
-			GuiMenuTopButton inv = new GuiMenuTopButton(3, ai.xPosition + ai.getWidth(), guiTop - 17, "menu.inventory");
-			GuiMenuTopButton advanced = new GuiMenuTopButton(4, inv.xPosition + inv.getWidth(), guiTop - 17, "menu.advanced");
-			GuiMenuTopButton global = new GuiMenuTopButton(5, advanced.xPosition + advanced.getWidth(), guiTop - 17, "menu.global");
-			GuiMenuTopButton delete = new GuiMenuTopButton(66,guiLeft + width - 72, guiTop - 17,"selectWorld.deleteButton");
-			delete.xPosition = close.xPosition - delete.getWidth();
-			topButtons = new GuiMenuTopButton[]{display,stats,ai,inv,advanced,global,close,delete};
-		} else {
-			topButtons = new GuiMenuTopButton[]{close};
-		}
-        
-        for(GuiMenuTopButton button : topButtons)
-        	button.active = button.id == activeMenu;
-    }
-    
-    private void topButtonPressed(GuiMenuTopButton button) {
-    	if(button.displayString.equals(activeMenu))
-    		return;
-    	Minecraft mc = Minecraft.getMinecraft();
-    	NoppesUtil.clickSound();
+        GuiMenuTopButton close = new GuiMenuTopButton(0, guiLeft + width - 22, guiTop - 17, "X");
+        if (npc != null) {
+            GuiMenuTopButton display = new GuiMenuTopButton(1, guiLeft + 4, guiTop - 17, "menu.display");
+            GuiMenuTopButton stats = new GuiMenuTopButton(2, display.xPosition + display.getWidth(), guiTop - 17, "menu.stats");
+            GuiMenuTopButton ai = new GuiMenuTopButton(6, stats.xPosition + stats.getWidth(), guiTop - 17, "menu.ai");
+            GuiMenuTopButton inv = new GuiMenuTopButton(3, ai.xPosition + ai.getWidth(), guiTop - 17, "menu.inventory");
+            GuiMenuTopButton advanced = new GuiMenuTopButton(4, inv.xPosition + inv.getWidth(), guiTop - 17, "menu.advanced");
+            GuiMenuTopButton global = new GuiMenuTopButton(5, advanced.xPosition + advanced.getWidth(), guiTop - 17, "menu.global");
+            GuiMenuTopButton delete = new GuiMenuTopButton(66, guiLeft + width - 72, guiTop - 17, "selectWorld.deleteButton");
+            delete.xPosition = close.xPosition - delete.getWidth();
+            topButtons = new GuiMenuTopButton[]{display, stats, ai, inv, advanced, global, close, delete};
+        } else {
+            topButtons = new GuiMenuTopButton[]{close};
+        }
 
-		int id = button.id;
-		if(id == 0){
-			close();
-			return;
-		}
-		else if(id == 66){
+        for (GuiMenuTopButton button : topButtons)
+            button.active = button.id == activeMenu;
+    }
+
+    private void topButtonPressed(GuiMenuTopButton button) {
+        if (button.displayString.equals(activeMenu))
+            return;
+        Minecraft mc = Minecraft.getMinecraft();
+        NoppesUtil.clickSound();
+
+        int id = button.id;
+        if (id == 0) {
+            close();
+            return;
+        } else if (id == 66) {
             GuiYesNo guiyesno = new GuiYesNo(this, "Confirm", StatCollector.translateToLocal("gui.delete"), 0);
             mc.displayGuiScreen(guiyesno);
             return;
-		}
-		save();
-		if(id == 1){
-			CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuDisplay);
-		}
-		else if(id == 2){
-			CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuStats);
-		}
-		else if(id == 3){
-			NoppesUtil.requestOpenGUI(EnumGuiType.MainMenuInv);
-		}
-		else if(id == 4){
-			CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuAdvanced);
-		}
-		else if(id == 5){
-			CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuGlobal);
-		}
-		else if(id == 6){
-			CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuAI);
-		}
-		activeMenu = id;
-	}
+        }
+        save();
+        if (id == 1) {
+            CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuDisplay);
+        } else if (id == 2) {
+            CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuStats);
+        } else if (id == 3) {
+            NoppesUtil.requestOpenGUI(EnumGuiType.MainMenuInv);
+        } else if (id == 4) {
+            CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuAdvanced);
+        } else if (id == 5) {
+            CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuGlobal);
+        } else if (id == 6) {
+            CustomNpcs.proxy.openGui(npc, EnumGuiType.MainMenuAI);
+        }
+        activeMenu = id;
+    }
 
-	private void save() {
-    	GuiNpcTextField.unfocus();
-    	
-		if(parent instanceof GuiContainerNPCInterface2)
-			((GuiContainerNPCInterface2)parent).save();
-		
-		if(parent instanceof GuiNPCInterface2)
-			((GuiNPCInterface2)parent).save();
-	} 
+    private void save() {
+        GuiNpcTextField.unfocus();
 
-	private void close() {
-		Keyboard.enableRepeatEvents(false);
+        if (parent instanceof GuiContainerNPCInterface2)
+            ((GuiContainerNPCInterface2) parent).save();
 
-		if(parent instanceof GuiContainerNPCInterface2)
-			((GuiContainerNPCInterface2)parent).close();
-		
-		if(parent instanceof GuiNPCInterface2)
-			((GuiNPCInterface2)parent).close();
-		if(npc != null){
-			npc.reset();
-			if(saveNPC)
-				Client.sendData(EnumPacketServer.NpcMenuClose);
-		}
-	} 
+        if (parent instanceof GuiNPCInterface2)
+            ((GuiNPCInterface2) parent).save();
+    }
 
-	public void mouseClicked(int i, int j, int k) {
-    	
-        if (k == 0)
-        {
-        	Minecraft mc = Minecraft.getMinecraft();
-            for (GuiMenuTopButton button : topButtons)
-            {
-                if (button.mousePressed(mc, i, j))
-                {
+    private void close() {
+        Keyboard.enableRepeatEvents(false);
+
+        if (parent instanceof GuiContainerNPCInterface2)
+            ((GuiContainerNPCInterface2) parent).close();
+
+        if (parent instanceof GuiNPCInterface2)
+            ((GuiNPCInterface2) parent).close();
+        if (npc != null) {
+            npc.reset();
+            if (saveNPC)
+                Client.sendData(EnumPacketServer.NpcMenuClose);
+        }
+    }
+
+    public void mouseClicked(int i, int j, int k) {
+
+        if (k == 0) {
+            Minecraft mc = Minecraft.getMinecraft();
+            for (GuiMenuTopButton button : topButtons) {
+                if (button.mousePressed(mc, i, j)) {
                     topButtonPressed(button);
                 }
             }
         }
-	}
+    }
 
 
-	public void drawElements(FontRenderer fontRenderer, int i, int j,
-			Minecraft mc, float f) {
-        for(GuiMenuTopButton button: topButtons)
-        	button.drawButton(mc, i, j);
-        
-	}
+    public void drawElements(FontRenderer fontRenderer, int i, int j, Minecraft mc, float f) {
+        for (GuiMenuTopButton button : topButtons)
+            button.drawButton(mc, i, j);
+
+    }
+
 
-    
     @Override
-    public void confirmClicked(boolean flag, int i){
-    	Minecraft mc = Minecraft.getMinecraft();
-		if(flag){
-			Client.sendData(EnumPacketServer.Delete);
-			mc.displayGuiScreen(null);
-	        mc.setIngameFocus();
-		}
-		else{
-			NoppesUtil.openGUI(mc.thePlayer, parent);
-		}
+    public void confirmClicked(boolean flag, int i) {
+        Minecraft mc = Minecraft.getMinecraft();
+        if (flag) {
+            Client.sendData(EnumPacketServer.Delete);
+            mc.displayGuiScreen(null);
+            mc.setIngameFocus();
+        } else {
+            NoppesUtil.openGUI(mc.thePlayer, parent);
+        }
     }
 }