diff --git a/src/main/java/baritone/cache/WorldProvider.java b/src/main/java/baritone/cache/WorldProvider.java
index dd6e35618..1bd27a98f 100644
--- a/src/main/java/baritone/cache/WorldProvider.java
+++ b/src/main/java/baritone/cache/WorldProvider.java
@@ -55,8 +55,8 @@ public class WorldProvider implements IWorldProvider, Helper {
      * @param dimension The ID of the world's dimension
      */
     public final void initWorld(int dimension) {
-        // Fight me @leijurv
-        File directory, readme;
+        File directory;
+        File readme;
 
         IntegratedServer integratedServer = mc.getIntegratedServer();
 
diff --git a/src/main/java/baritone/process/FollowProcess.java b/src/main/java/baritone/process/FollowProcess.java
index 41a598089..959e3a485 100644
--- a/src/main/java/baritone/process/FollowProcess.java
+++ b/src/main/java/baritone/process/FollowProcess.java
@@ -79,10 +79,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
         if (entity.equals(player())) {
             return false;
         }
-        if (!world().loadedEntityList.contains(entity) && !world().playerEntities.contains(entity)) {
-            return false;
-        }
-        return true;
+        return world().loadedEntityList.contains(entity) || world().playerEntities.contains(entity);
     }
 
     private void scanWorld() {
diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java
index 9c3eed7fb..fc902cf1b 100755
--- a/src/main/java/baritone/utils/InputOverrideHandler.java
+++ b/src/main/java/baritone/utils/InputOverrideHandler.java
@@ -37,15 +37,15 @@ import java.util.Map;
  */
 public final class InputOverrideHandler extends Behavior implements Helper {
 
-    public InputOverrideHandler(Baritone baritone) {
-        super(baritone);
-    }
-
     /**
      * Maps inputs to whether or not we are forcing their state down.
      */
     private final Map<Input, Boolean> inputForceStateMap = new HashMap<>();
 
+    public InputOverrideHandler(Baritone baritone) {
+        super(baritone);
+    }
+
     /**
      * Returns whether or not we are forcing down the specified {@link KeyBinding}.
      *