diff --git a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
index 84c44c36..37537898 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
@@ -489,7 +489,7 @@ public class DisguiseAPI {
     }
 
     /**
-     * Set whether this player can see his own disguise or not.
+     * Set whether this player can see their own disguise or not.
      *
      * @param entity
      * @param canSeeSelfDisguises
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
index 410c0f68..5d63d859 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -655,7 +655,7 @@ public abstract class Disguise {
     }
 
     /**
-     * Can the disguised view himself as the disguise
+     * Can the disguised view themselves as the disguise
      *
      * @return viewSelfDisguise
      */
@@ -869,7 +869,7 @@ public abstract class Disguise {
     }
 
     /**
-     * Can the disguised view himself as the disguise
+     * Can the disguised view themselves as the disguise
      *
      * @param viewSelfDisguise
      * @return
@@ -1009,7 +1009,7 @@ public abstract class Disguise {
         // Resend the disguised entity's packet
         DisguiseUtilities.refreshTrackers((TargetedDisguise) this);
 
-        // If he is a player, then self disguise himself
+        // Setup a scheduler for a self disguise
         Bukkit.getScheduler().scheduleSyncDelayedTask(LibsDisguises.getInstance(), () -> DisguiseUtilities.setupFakeDisguise(Disguise.this), 2);
 
         if (isHidePlayer() && getEntity() instanceof Player) {
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
index 093f5bc7..908cccc0 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
@@ -94,8 +94,8 @@ public class MiscDisguise extends TargetedDisguise {
                 ((DroppedItemWatcher) getWatcher()).setItemStack(itemStack);
                 break;
             case FISHING_HOOK: // Entity ID of whoever is holding fishing rod
-            case ARROW: // Entity ID of shooter. Used for "Is he on this scoreboard team and do I render it moving
-                // through his body?"
+            case ARROW: // Entity ID of shooter. Used for "Are they on this scoreboard team and do I render it moving
+                // through their body?"
             case SPECTRAL_ARROW:
             case SMALL_FIREBALL: // Unknown. Uses entity id of shooter. 0 if no shooter
             case FIREBALL: // Unknown. Uses entity id of shooter. 0 if no shooter
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 86c1a1a3..0afc7d0f 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -2094,7 +2094,7 @@ public class DisguiseUtilities {
             if (entityTrackerEntry != null) {
 
                 // TODO Store reflection fields
-                // If the tracker exists. Remove himself from his tracker
+                // If the tracker exists. Remove the player from their tracker
                 if (!isRunningPaper() || NmsVersion.v1_17.isSupported()) {
                     ReflectionManager.getTrackedPlayers(entityTrackerEntry).remove(ReflectionManager.getPlayerConnectionOrPlayer(player));
                 } else {
@@ -2612,7 +2612,7 @@ public class DisguiseUtilities {
             // TODO Store reflection fields
             // Check for code differences in PaperSpigot vs Spigot
             if (!isRunningPaper() || NmsVersion.v1_17.isSupported()) {
-                // Add himself to his own entity tracker
+                // Add the player to their own entity tracker
                 ReflectionManager.getTrackedPlayers(entityTrackerEntry).add(ReflectionManager.getPlayerConnectionOrPlayer(player));
             } else {
                 Field field = ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayerMap");
@@ -2899,7 +2899,7 @@ public class DisguiseUtilities {
     }
 
     /**
-     * Setup it so he can see himself when disguised
+     * Setup it so he can see their own disguise when disguised
      *
      * @param disguise
      */
@@ -2921,7 +2921,7 @@ public class DisguiseUtilities {
         // Remove the old disguise, else we have weird disguises around the place
         DisguiseUtilities.removeSelfDisguise(disguise);
 
-        // If the disguised player can't see himself. Return
+        // If the disguised player can't see themselves. Return
         if (!disguise.isSelfDisguiseVisible() || !PacketsManager.isViewDisguisesListenerEnabled() || player.getVehicle() != null) {
             return;
         }