diff --git a/src/main/java/server/maps/MapleFootholdTree.java b/src/main/java/server/maps/FootholdTree.java
similarity index 86%
rename from src/main/java/server/maps/MapleFootholdTree.java
rename to src/main/java/server/maps/FootholdTree.java
index 7b53a988a5..79bf2db712 100644
--- a/src/main/java/server/maps/MapleFootholdTree.java
+++ b/src/main/java/server/maps/FootholdTree.java
@@ -27,30 +27,29 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- *
  * @author Matze
  */
-public class MapleFootholdTree {
-    private MapleFootholdTree nw = null;
-    private MapleFootholdTree ne = null;
-    private MapleFootholdTree sw = null;
-    private MapleFootholdTree se = null;
-    private List<Foothold> footholds = new LinkedList<>();
-    private Point p1;
-    private Point p2;
-    private Point center;
+public class FootholdTree {
+    private FootholdTree nw = null;
+    private FootholdTree ne = null;
+    private FootholdTree sw = null;
+    private FootholdTree se = null;
+    private final List<Foothold> footholds = new LinkedList<>();
+    private final Point p1;
+    private final Point p2;
+    private final Point center;
     private int depth = 0;
-    private static int maxDepth = 8;
+    private static final int maxDepth = 8;
     private int maxDropX;
     private int minDropX;
 
-    public MapleFootholdTree(Point p1, Point p2) {
+    public FootholdTree(Point p1, Point p2) {
         this.p1 = p1;
         this.p2 = p2;
         center = new Point((p2.x - p1.x) / 2, (p2.y - p1.y) / 2);
     }
 
-    public MapleFootholdTree(Point p1, Point p2, int depth) {
+    public FootholdTree(Point p1, Point p2, int depth) {
         this.p1 = p1;
         this.p2 = p2;
         this.depth = depth;
@@ -74,14 +73,14 @@ public class MapleFootholdTree {
         }
         if (depth == maxDepth ||
                 (f.getX1() >= p1.x && f.getX2() <= p2.x &&
-                f.getY1() >= p1.y && f.getY2() <= p2.y)) {
+                        f.getY1() >= p1.y && f.getY2() <= p2.y)) {
             footholds.add(f);
         } else {
             if (nw == null) {
-                nw = new MapleFootholdTree(p1, center, depth + 1);
-                ne = new MapleFootholdTree(new Point(center.x, p1.y), new Point(p2.x, center.y), depth + 1);
-                sw = new MapleFootholdTree(new Point(p1.x, center.y), new Point(center.x, p2.y), depth + 1);
-                se = new MapleFootholdTree(center, p2, depth + 1);
+                nw = new FootholdTree(p1, center, depth + 1);
+                ne = new FootholdTree(new Point(center.x, p1.y), new Point(p2.x, center.y), depth + 1);
+                sw = new FootholdTree(new Point(p1.x, center.y), new Point(center.x, p2.y), depth + 1);
+                se = new FootholdTree(center, p2, depth + 1);
             }
             if (f.getX2() <= center.x && f.getY2() <= center.y) {
                 nw.insert(f);
@@ -144,9 +143,7 @@ public class MapleFootholdTree {
             }
             if ((p1.x > center.x || p2.x > center.x) && p1.y > center.y) {
                 ret = se.findWallR(p1, p2);
-                if (ret != null) {
-                    return ret;
-                }
+                return ret;
             }
         }
         return null;
diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java
index 2d71aea543..ea9a66912e 100644
--- a/src/main/java/server/maps/MapleMap.java
+++ b/src/main/java/server/maps/MapleMap.java
@@ -98,7 +98,7 @@ public class MapleMap {
     private Map<MobLootEntry, Long> mobLootEntries = new HashMap(20);
     private List<Runnable> statUpdateRunnables = new ArrayList(50);
     private List<Rectangle> areas = new ArrayList<>();
-    private MapleFootholdTree footholds = null;
+    private FootholdTree footholds = null;
     private Pair<Integer, Integer> xLimits;  // caches the min and max x's with available footholds
     private Rectangle mapArea = new Rectangle();
     private int mapid;
@@ -3036,11 +3036,11 @@ public class MapleMap {
         return areas.get(index);
     }
 
-    public void setFootholds(MapleFootholdTree footholds) {
+    public void setFootholds(FootholdTree footholds) {
         this.footholds = footholds;
     }
 
-    public MapleFootholdTree getFootholds() {
+    public FootholdTree getFootholds() {
         return footholds;
     }
     
diff --git a/src/main/java/server/maps/MapleMapFactory.java b/src/main/java/server/maps/MapleMapFactory.java
index a7ce8c5a85..f4cefa63b0 100644
--- a/src/main/java/server/maps/MapleMapFactory.java
+++ b/src/main/java/server/maps/MapleMapFactory.java
@@ -216,7 +216,7 @@ public class MapleMapFactory {
                 }
             }
         }
-        MapleFootholdTree fTree = new MapleFootholdTree(lBound, uBound);
+        FootholdTree fTree = new FootholdTree(lBound, uBound);
         for (Foothold fh : allFootholds) {
             fTree.insert(fh);
         }