diff --git a/src/main/java/org/ultramine/mods/umcommands/ButtonCommand.java b/src/main/java/org/ultramine/mods/umcommands/ButtonCommand.java
index a05b527..664fb69 100644
--- a/src/main/java/org/ultramine/mods/umcommands/ButtonCommand.java
+++ b/src/main/java/org/ultramine/mods/umcommands/ButtonCommand.java
@@ -38,8 +38,8 @@
 	private final MinecraftServer server;
 	private final File storage;
 
-	private ButtomCMDs buttons;
-	private TIntObjectMap<TLongObjectHashMap<ButtomCMDs.ButtomCMD>> buttonMap = new TIntObjectHashMap<TLongObjectHashMap<ButtomCMDs.ButtomCMD>>();
+	private ButtonCMDs buttons;
+	private TIntObjectMap<TLongObjectHashMap<ButtonCMDs.ButtonCMD>> buttonMap = new TIntObjectHashMap<>();
 
 	public ButtonCommand(MinecraftServer server)
 	{
@@ -52,8 +52,8 @@
 	{
 		e.registerCommands(this.getClass());
 		MinecraftForge.EVENT_BUS.register(this);
-		buttons = YamlConfigProvider.getOrCreateConfig(storage, ButtomCMDs.class);
-		for(ButtomCMDs.ButtomCMD cmd : buttons.buttons)
+		buttons = YamlConfigProvider.getOrCreateConfig(storage, ButtonCMDs.class);
+		for(ButtonCMDs.ButtonCMD cmd : buttons.buttons)
 			putCmd(cmd);
 	}
 
@@ -68,19 +68,19 @@
 		YamlConfigProvider.saveConfig(storage, buttons);
 	}
 
-	private void putCmd(ButtomCMDs.ButtomCMD bt)
+	private void putCmd(ButtonCMDs.ButtonCMD bt)
 	{
-		TLongObjectHashMap<ButtomCMDs.ButtomCMD> map = buttonMap.get(bt.dim);
+		TLongObjectHashMap<ButtonCMDs.ButtonCMD> map = buttonMap.get(bt.dim);
 		if(map == null)
 		{
-			map = new TLongObjectHashMap<ButtomCMDs.ButtomCMD>();
+			map = new TLongObjectHashMap<>();
 			buttonMap.put(bt.dim, map);
 		}
 
 		map.put(bt.getKey(), bt);
 	}
 
-	private void add(ButtomCMDs.ButtomCMD bt)
+	private void add(ButtonCMDs.ButtonCMD bt)
 	{
 		buttons.buttons.add(bt);
 		putCmd(bt);
@@ -89,7 +89,7 @@
 
 	private boolean exists(int dim, int x, int y, int z)
 	{
-		TLongObjectHashMap<ButtomCMDs.ButtomCMD> map = buttonMap.get(dim);
+		TLongObjectHashMap<ButtonCMDs.ButtonCMD> map = buttonMap.get(dim);
 		return map != null && map.contains(ChunkHash.blockCoordToHash(x, y, z));
 	}
 
@@ -97,22 +97,22 @@
 	{
 		for(int i = 0; i < cmds.length; i++)
 			cmds[i] = cmds[i].trim();
-		ButtomCMDs.ButtomCMD bt = new ButtomCMDs.ButtomCMD(dim, x, y, z, permission, cmds);
+		ButtonCMDs.ButtonCMD bt = new ButtonCMDs.ButtonCMD(dim, x, y, z, permission, cmds);
 		add(bt);
 	}
 
-	private ButtomCMDs.ButtomCMD get(int dim, int x, int y, int z)
+	private ButtonCMDs.ButtonCMD get(int dim, int x, int y, int z)
 	{
-		TLongObjectHashMap<ButtomCMDs.ButtomCMD> map = buttonMap.get(dim);
+		TLongObjectHashMap<ButtonCMDs.ButtonCMD> map = buttonMap.get(dim);
 		return map == null ? null : map.get(ChunkHash.blockCoordToHash(x, y, z));
 	}
 
 	private void remove(int dim, int x, int y, int z)
 	{
-		TLongObjectHashMap<ButtomCMDs.ButtomCMD> map = buttonMap.get(dim);
+		TLongObjectHashMap<ButtonCMDs.ButtonCMD> map = buttonMap.get(dim);
 		if(map != null)
 		{
-			ButtomCMDs.ButtomCMD bt = map.remove(ChunkHash.blockCoordToHash(x, y, z));
+			ButtonCMDs.ButtonCMD bt = map.remove(ChunkHash.blockCoordToHash(x, y, z));
 			if(bt != null)
 			{
 				buttons.buttons.remove(bt);
@@ -153,20 +153,21 @@
 		}
 		else if(ctx.getAction().startsWith("g"))
 		{
-			ctx.check(instance.exists(player.dimension, obj.blockX, obj.blockY, obj.blockZ), "command.buttoncommand.fail.none");
-			ButtomCMDs.ButtomCMD bt = instance.get(player.dimension, obj.blockX, obj.blockY, obj.blockZ);
+			ButtonCMDs.ButtonCMD bt = instance.get(player.dimension, obj.blockX, obj.blockY, obj.blockZ);
+			ctx.check(bt != null, "command.buttoncommand.fail.none");
 			ctx.sendMessage("command.buttoncommand.get.head");
+			//noinspection ConstantConditions
 			for(String cmd : bt.commands)
 				ctx.sendMessage("    - %s", cmd);
 		}
 	}
 
-	@SubscribeEvent()
+	@SubscribeEvent
 	public void onPlayerInteractEvent(PlayerInteractEvent e)
 	{
 		if(e.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK)
 			return;
-		ButtomCMDs.ButtomCMD bt = get(e.world.provider.dimensionId, e.x, e.y, e.z);
+		ButtonCMDs.ButtonCMD bt = get(e.world.provider.dimensionId, e.x, e.y, e.z);
 		if(bt != null)
 		{
 			e.setCanceled(true);
@@ -188,11 +189,11 @@
 		remove(e.world.provider.dimensionId, e.x, e.y, e.z);
 	}
 
-	public static class ButtomCMDs
+	public static class ButtonCMDs
 	{
-		public List<ButtomCMD> buttons = new ArrayList<ButtomCMD>();
+		public List<ButtonCMD> buttons = new ArrayList<>();
 
-		public static class ButtomCMD
+		public static class ButtonCMD
 		{
 			public int dim;
 			public int x;
@@ -201,8 +202,8 @@
 			public String permission;
 			public String[] commands;
 
-			public ButtomCMD(){}
-			public ButtomCMD(int dim, int x, int y, int z, String permission, String[] commands)
+			public ButtonCMD(){}
+			public ButtonCMD(int dim, int x, int y, int z, String permission, String[] commands)
 			{
 				this.dim = dim;
 				this.x = x;
@@ -214,9 +215,9 @@
 
 			public boolean equals(Object o)
 			{
-				if(!(o instanceof ButtomCMD))
+				if(!(o instanceof ButtonCMD))
 					return false;
-				ButtomCMD cmd = (ButtomCMD)o;
+				ButtonCMD cmd = (ButtonCMD)o;
 				return dim == cmd.dim && x == cmd.x && y == cmd.y && z == cmd.z;
 			}