diff --git a/src/main/java/com/minelittlepony/unicopia/EntitySupplier.java b/src/main/java/com/minelittlepony/unicopia/EntitySupplier.java
deleted file mode 100644
index 14b852b5..00000000
--- a/src/main/java/com/minelittlepony/unicopia/EntitySupplier.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.minelittlepony.unicopia;
-
-import net.minecraft.entity.Entity;
-
-public interface EntitySupplier {
-    /**
-     * Gets the owner that holds this object.
-     */
-    Entity getEntity();
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/Owned.java b/src/main/java/com/minelittlepony/unicopia/Owned.java
index 2eecb8c7..1ff04421 100644
--- a/src/main/java/com/minelittlepony/unicopia/Owned.java
+++ b/src/main/java/com/minelittlepony/unicopia/Owned.java
@@ -46,7 +46,9 @@ public interface Owned<E extends Entity> {
     }
 
     default boolean isOwnedBy(@Nullable Object owner) {
-        return owner instanceof Entity e && getMasterId().isPresent() && e.getUuid().equals(getMasterId().get());
+        return owner instanceof Entity e
+                && getMasterId().isPresent()
+                && e.getUuid().equals(getMasterId().get());
     }
 
     default boolean hasCommonOwner(Owned<?> sibling) {
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
index b036bbc4..1d444617 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
@@ -51,12 +51,15 @@ public class EntityReference<T extends Entity> implements NbtSerialisable {
         }
     }
 
+    /**
+     * Gets the assigned entity's UUID
+     */
     public Optional<UUID> getId() {
         return uuid;
     }
 
     /**
-     * Gets the position the last known position of the assigned entity.
+     * Gets the last known position of the assigned entity.
      */
     public Optional<Vec3d> getPosition() {
         return pos;