diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 9ae0ea899a..bb9058636a 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -88,9 +88,7 @@ public class GeoEngine
 		{
 			for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
 			{
-				final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry);
-				final String filepath = Config.GEODATA_PATH + filename;
-				final File f = new File(filepath);
+				final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
 				if (f.exists() && !f.isDirectory())
 				{
 					// region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
 	private final boolean loadGeoBlocks(int regionX, int regionY)
 	{
 		final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
-		final String filepath = Config.GEODATA_PATH + filename;
 		
 		// standard load
-		try (RandomAccessFile raf = new RandomAccessFile(filepath, "r");
+		try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
 			FileChannel fc = raf.getChannel())
 		{
 			// initialize file buffer
@@ -155,19 +152,24 @@ public class GeoEngine
 					switch (type)
 					{
 						case GeoStructure.TYPE_FLAT_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_COMPLEX_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_MULTILAYER_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						default:
+						{
 							throw new IllegalArgumentException("Unknown block type: " + type);
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 9ae0ea899a..bb9058636a 100644
--- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -88,9 +88,7 @@ public class GeoEngine
 		{
 			for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
 			{
-				final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry);
-				final String filepath = Config.GEODATA_PATH + filename;
-				final File f = new File(filepath);
+				final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
 				if (f.exists() && !f.isDirectory())
 				{
 					// region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
 	private final boolean loadGeoBlocks(int regionX, int regionY)
 	{
 		final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
-		final String filepath = Config.GEODATA_PATH + filename;
 		
 		// standard load
-		try (RandomAccessFile raf = new RandomAccessFile(filepath, "r");
+		try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
 			FileChannel fc = raf.getChannel())
 		{
 			// initialize file buffer
@@ -155,19 +152,24 @@ public class GeoEngine
 					switch (type)
 					{
 						case GeoStructure.TYPE_FLAT_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_COMPLEX_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_MULTILAYER_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						default:
+						{
 							throw new IllegalArgumentException("Unknown block type: " + type);
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 9ae0ea899a..bb9058636a 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -88,9 +88,7 @@ public class GeoEngine
 		{
 			for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
 			{
-				final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry);
-				final String filepath = Config.GEODATA_PATH + filename;
-				final File f = new File(filepath);
+				final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
 				if (f.exists() && !f.isDirectory())
 				{
 					// region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
 	private final boolean loadGeoBlocks(int regionX, int regionY)
 	{
 		final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
-		final String filepath = Config.GEODATA_PATH + filename;
 		
 		// standard load
-		try (RandomAccessFile raf = new RandomAccessFile(filepath, "r");
+		try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
 			FileChannel fc = raf.getChannel())
 		{
 			// initialize file buffer
@@ -155,19 +152,24 @@ public class GeoEngine
 					switch (type)
 					{
 						case GeoStructure.TYPE_FLAT_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_COMPLEX_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_MULTILAYER_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						default:
+						{
 							throw new IllegalArgumentException("Unknown block type: " + type);
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 385272b17c..cc98e5e6b9 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -86,9 +86,7 @@ public class GeoEngine
 		{
 			for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
 			{
-				final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry);
-				final String filepath = Config.GEODATA_PATH + filename;
-				final File f = new File(filepath);
+				final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
 				if (f.exists() && !f.isDirectory())
 				{
 					// region file is load-able, try to load it
@@ -127,10 +125,9 @@ public class GeoEngine
 	private final boolean loadGeoBlocks(int regionX, int regionY)
 	{
 		final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
-		final String filepath = Config.GEODATA_PATH + filename;
 		
 		// standard load
-		try (RandomAccessFile raf = new RandomAccessFile(filepath, "r");
+		try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
 			FileChannel fc = raf.getChannel())
 		{
 			// initialize file buffer
@@ -153,19 +150,24 @@ public class GeoEngine
 					switch (type)
 					{
 						case GeoStructure.TYPE_FLAT_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_COMPLEX_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_MULTILAYER_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						default:
+						{
 							throw new IllegalArgumentException("Unknown block type: " + type);
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 9ae0ea899a..bb9058636a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -88,9 +88,7 @@ public class GeoEngine
 		{
 			for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
 			{
-				final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry);
-				final String filepath = Config.GEODATA_PATH + filename;
-				final File f = new File(filepath);
+				final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
 				if (f.exists() && !f.isDirectory())
 				{
 					// region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
 	private final boolean loadGeoBlocks(int regionX, int regionY)
 	{
 		final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
-		final String filepath = Config.GEODATA_PATH + filename;
 		
 		// standard load
-		try (RandomAccessFile raf = new RandomAccessFile(filepath, "r");
+		try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
 			FileChannel fc = raf.getChannel())
 		{
 			// initialize file buffer
@@ -155,19 +152,24 @@ public class GeoEngine
 					switch (type)
 					{
 						case GeoStructure.TYPE_FLAT_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_COMPLEX_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						case GeoStructure.TYPE_MULTILAYER_L2D:
+						{
 							_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
 							break;
-						
+						}
 						default:
+						{
 							throw new IllegalArgumentException("Unknown block type: " + type);
+						}
 					}
 				}
 			}