diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java
index b2a9a9f88b..763b79e5f2 100644
--- a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java
+++ b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java
@@ -26,21 +26,12 @@ public static EntityCanTick getFrom(ObjectTag entity) {
             "can_tick"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityCanTick(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(((ArmorStand) entity.getBukkitEntity()).canTick());
@@ -51,10 +42,6 @@ public String getPropertyId() {
         return "can_tick";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     public static void registerTags() {
 
         // <--[tag]
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java
index f9e29e6f62..d479eaeca3 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java
@@ -32,21 +32,12 @@ public static EntityAI getFrom(ObjectTag entity) {
             "has_ai", "toggle_ai"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAI(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(!NMSHandler.getEntityHelper().isAIDisabled(entity.getBukkitEntity()));
@@ -57,11 +48,6 @@ public String getPropertyId() {
         return "has_ai";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java
index d5648867e7..c4a3bdf10f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java
@@ -41,11 +41,6 @@ public static EntityAge getFrom(ObjectTag entity) {
             "age_lock", "age"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAge(EntityTag entity) {
         ageable = entity;
     }
@@ -117,11 +112,6 @@ public boolean getLock() {
         return (ageable.getBukkitEntity() instanceof Zombie) || ((Ageable) ageable.getBukkitEntity()).getAgeLock();
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return getAge() + (getLock() ? "|locked" : "");
@@ -132,11 +122,6 @@ public String getPropertyId() {
         return "age";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAnger.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAnger.java
index 9321456e6d..9d3ed91715 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAnger.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAnger.java
@@ -40,21 +40,12 @@ public static EntityAnger getFrom(ObjectTag entity) {
             "anger"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAnger(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(getAnger());
@@ -65,10 +56,6 @@ public String getPropertyId() {
         return "anger";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     public int getAnger() {
         if (entity.getBukkitEntity() instanceof PigZombie) {
             return ((PigZombie) entity.getBukkitEntity()).getAnger();
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAngry.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAngry.java
index c3bf2bf4a8..dfca88d81d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAngry.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAngry.java
@@ -34,21 +34,12 @@ public static EntityAngry getFrom(ObjectTag entity) {
             "angry"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAngry(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (entity.getBukkitEntityType() == EntityType.WOLF) {
@@ -75,10 +66,6 @@ public String getPropertyId() {
         return "angry";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java
index defafe0041..d8308c3139 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java
@@ -47,21 +47,12 @@ public static EntityAreaEffectCloud getFrom(ObjectTag entity) {
             "radius_per_tick", "reapplication_delay", "source", "wait_time"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAreaEffectCloud(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return null;
@@ -72,11 +63,6 @@ public String getPropertyId() {
         return "area_effect_cloud";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java
index c12b461114..946022a095 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java
@@ -31,21 +31,12 @@ public static EntityArmorBonus getFrom(ObjectTag entity) {
             "armor_bonus"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityArmorBonus(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (entity.getLivingEntity().getAttribute(org.bukkit.attribute.Attribute.GENERIC_ARMOR).getValue() > 0.0) {
@@ -63,11 +54,6 @@ public ElementTag getArmorBonus() {
         return new ElementTag(entity.getLivingEntity().getAttribute(org.bukkit.attribute.Attribute.GENERIC_ARMOR).getValue());
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java
index 8dc10b5408..850d03e96b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java
@@ -39,21 +39,12 @@ public static EntityArmorPose getFrom(ObjectTag entity) {
             "armor_pose"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityArmorPose(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return getPoseList().identify();
@@ -74,10 +65,6 @@ private ListTag getPoseList() {
         return list;
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArms.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArms.java
index 2653feaaaf..4ca49641f9 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArms.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArms.java
@@ -32,21 +32,12 @@ public static EntityArms getFrom(ObjectTag entity) {
             "arms"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityArms(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!((ArmorStand) dentity.getBukkitEntity()).hasArms()) {
@@ -62,10 +53,6 @@ public String getPropertyId() {
         return "arms";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java
index ef0372aa06..0e8b0f143f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java
@@ -30,21 +30,12 @@ public static EntityArrowDamage getFrom(ObjectTag entity) {
             "damage"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityArrowDamage(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(NMSHandler.getEntityHelper().getArrowDamage(dentity.getBukkitEntity()));
@@ -55,10 +46,6 @@ public String getPropertyId() {
         return "damage";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAttributes.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAttributes.java
index 9899744c44..1eda32ccf8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAttributes.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAttributes.java
@@ -41,21 +41,12 @@ public static EntityAttributes getFrom(ObjectTag entity) {
             "attributes"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityAttributes(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     public static String stringify(AttributeModifier modifier) {
         return EscapeTagBase.escape(modifier.getName()) + "/" + modifier.getAmount() + "/" + modifier.getOperation().name()
                 + "/" + (modifier.getSlot() == null ? "any" : modifier.getSlot().name());
@@ -91,10 +82,6 @@ public String getPropertyId() {
         return "attributes";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBasePlate.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBasePlate.java
index 635c758ee3..087d27d5f8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBasePlate.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBasePlate.java
@@ -32,21 +32,12 @@ public static EntityBasePlate getFrom(ObjectTag entity) {
             "base_plate"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityBasePlate(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (((ArmorStand) dentity.getBukkitEntity()).hasBasePlate()) {
@@ -62,10 +53,6 @@ public String getPropertyId() {
         return "base_plate";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBeamTarget.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBeamTarget.java
index 33f3e76419..d1bf274834 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBeamTarget.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBeamTarget.java
@@ -33,21 +33,12 @@ public static EntityBeamTarget getFrom(ObjectTag entity) {
             "beam_target"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityBeamTarget(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return new LocationTag(((EnderCrystal) dentity.getBukkitEntity()).getBeamTarget()).identify();
@@ -58,10 +49,6 @@ public String getPropertyId() {
         return "beam_target";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoatType.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoatType.java
index 877bd93532..a46fe18f13 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoatType.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoatType.java
@@ -33,21 +33,12 @@ public static EntityBoatType getFrom(ObjectTag object) {
             "boat_type"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityBoatType(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return ((Boat) entity.getBukkitEntity()).getWoodType().name();
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java
index 7dd295fcc4..0291f6b372 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java
@@ -30,21 +30,12 @@ public static EntityBodyArrows getFrom(ObjectTag object) {
             "body_arrows", "clear_body_arrows"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityBodyArrows(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     private int getBodyArrows() {
         return NMSHandler.getEntityHelper().getBodyArrows(entity.getBukkitEntity());
     }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java
index c9ec1fa84a..f0d2863cc8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java
@@ -48,10 +48,6 @@ public static void remove(UUID uuid) {
         }
     }
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityBoundingBox(EntityTag entity) {
         this.entity = entity;
     }
@@ -66,10 +62,6 @@ private ListTag getBoundingBox() {
         return list;
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (entity.isCitizensNPC()) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java
index 526480f093..27f8281500 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java
@@ -32,21 +32,12 @@ public static EntityChestCarrier getFrom(ObjectTag entity) {
             "carries_chest"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityChestCarrier(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return NMSHandler.getEntityHelper().isCarryingChest(entity.getBukkitEntity()) ? "true" : "false";
@@ -57,10 +48,6 @@ public String getPropertyId() {
         return "carries_chest";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java
index 1708a562fa..ebb4f48e1a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java
@@ -59,11 +59,6 @@ public static EntityColor getFrom(ObjectTag entity) {
             "color"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityColor(EntityTag entity) {
         colored = entity;
     }
@@ -122,10 +117,6 @@ else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_14) && type == EntityTy
         }
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         String color = getColor();
@@ -137,11 +128,6 @@ public String getPropertyId() {
         return "color";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     // <--[language]
     // @name Entity Color Types
     // @group Properties
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCritical.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCritical.java
index d8a9f424dd..2ea13c0d67 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCritical.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCritical.java
@@ -31,21 +31,12 @@ public static EntityCritical getFrom(ObjectTag entity) {
             "critical"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityCritical(EntityTag entity) {
         critical = entity;
     }
 
     EntityTag critical;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!((Arrow) critical.getBukkitEntity()).isCritical()) {
@@ -61,10 +52,6 @@ public String getPropertyId() {
         return "critical";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDisabledSlots.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDisabledSlots.java
index 34dfe90f33..417e06b7b7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDisabledSlots.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityDisabledSlots.java
@@ -38,11 +38,6 @@ public static EntityDisabledSlots getFrom(ObjectTag entity) {
             "disabled_slots_raw", "disabled_slots"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityDisabledSlots(EntityTag entity) {
         dentity = entity;
     }
@@ -74,10 +69,6 @@ private ListTag getDisabledSlots() {
         return list;
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         ListTag list = getDisabledSlots();
@@ -89,10 +80,6 @@ public String getPropertyId() {
         return "disabled_slots";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityElder.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityElder.java
index 3b14176c29..52871f9d8d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityElder.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityElder.java
@@ -32,11 +32,6 @@ public static EntityElder getFrom(ObjectTag entity) {
             "elder"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityElder(EntityTag entity) {
         this.entity = entity;
     }
@@ -55,10 +50,6 @@ private void setElder(boolean elder) {
         ((Guardian) (entity.getBukkitEntity())).setElder(elder);
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!getElder()) {
@@ -74,10 +65,6 @@ public String getPropertyId() {
         return "elder";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityEquipment.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityEquipment.java
index b4cfba7007..a1196236e8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityEquipment.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityEquipment.java
@@ -35,21 +35,12 @@ public static EntityEquipment getFrom(ObjectTag entity) {
             "equipment"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityEquipment(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return entity.getEquipment().identify();
@@ -60,11 +51,6 @@ public String getPropertyId() {
         return "equipment";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionFire.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionFire.java
index 3b05ee24c4..5a0fad03ed 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionFire.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionFire.java
@@ -31,20 +31,12 @@ public boolean isIncendiary() {
         return ((Explosive) entity.getBukkitEntity()).isIncendiary();
     }
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityExplosionFire(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(isIncendiary());
@@ -55,10 +47,6 @@ public String getPropertyId() {
         return "explosion_fire";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionRadius.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionRadius.java
index 4c8af91b66..e2bcb31c7a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionRadius.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityExplosionRadius.java
@@ -36,20 +36,12 @@ public float getExplosionRadius() {
         return ((Explosive) entity.getBukkitEntity()).getYield();
     }
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityExplosionRadius(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(getExplosionRadius());
@@ -60,10 +52,6 @@ public String getPropertyId() {
         return "explosion_radius";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFirework.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFirework.java
index abf97e836d..3b3dc45717 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFirework.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFirework.java
@@ -36,21 +36,12 @@ public static EntityFirework getFrom(ObjectTag entity) {
             "firework_item", "detonate"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityFirework(EntityTag entity) {
         firework = entity;
     }
 
     EntityTag firework;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         ItemStack item = new ItemStack(MaterialCompat.FIREWORK_ROCKET);
@@ -63,10 +54,6 @@ public String getPropertyId() {
         return "firework_item";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java
index f68eb6f2c7..15a707d987 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java
@@ -39,11 +39,6 @@ public static EntityFramed getFrom(ObjectTag entity) {
             "framed"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityFramed(EntityTag item) {
         item_frame = item;
     }
@@ -67,11 +62,6 @@ public ItemTag getItem() {
         return new ItemTag(getItemFrameEntity().getItem());
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (hasItem()) {
@@ -89,11 +79,6 @@ public String getPropertyId() {
         return "framed";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java
index a8ce20074b..4f5d81cfb4 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityGravity.java
@@ -30,21 +30,12 @@ public static EntityGravity getFrom(ObjectTag entity) {
             "gravity"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityGravity(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (dentity.getBukkitEntity().hasGravity()) {
@@ -60,10 +51,6 @@ public String getPropertyId() {
         return "gravity";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java
index 71f315e5be..e44631dd54 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java
@@ -37,21 +37,12 @@ public static EntityHealth getFrom(ObjectTag entity) {
             "max_health", "health_data", "health"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityHealth(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return entity.getLivingEntity().getHealth() + "/" + entity.getLivingEntity().getMaxHealth();
@@ -83,11 +74,6 @@ else if ((float) entity.getLivingEntity().getHealth() / maxHealth < 1) {
         }
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInfected.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInfected.java
index 158af47ec6..eb0ea5c493 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInfected.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInfected.java
@@ -41,11 +41,6 @@ public static EntityInfected getFrom(ObjectTag entity) {
             "is_infected"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityInfected(EntityTag item) {
         infected = item;
     }
@@ -78,11 +73,6 @@ public void setInfected(boolean bool) {
         }
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (isInfected()) {
@@ -98,11 +88,6 @@ public String getPropertyId() {
         return "infected";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java
index 552853279f..60c7f8e0c1 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java
@@ -35,21 +35,12 @@ public static EntityInventory getFrom(ObjectTag entity) {
             "inventory_contents"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityInventory(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return new InventoryContents(entity.getInventory()).getContents(0).identify();
@@ -60,11 +51,6 @@ public String getPropertyId() {
         return "inventory_contents";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInvulnerable.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInvulnerable.java
index 8254c2835f..89a00903ce 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInvulnerable.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInvulnerable.java
@@ -30,21 +30,12 @@ public static EntityInvulnerable getFrom(ObjectTag entity) {
             "invulnerable"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityInvulnerable(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!dentity.getBukkitEntity().isInvulnerable()) {
@@ -60,10 +51,6 @@ public String getPropertyId() {
         return "invulnerable";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityIsShowingBottom.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityIsShowingBottom.java
index f8772c25fb..6f0f87deed 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityIsShowingBottom.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityIsShowingBottom.java
@@ -32,21 +32,12 @@ public static EntityIsShowingBottom getFrom(ObjectTag entity) {
             "is_showing_bottom"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityIsShowingBottom(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (((EnderCrystal) dentity.getBukkitEntity()).isShowingBottom()) {
@@ -62,10 +53,6 @@ public String getPropertyId() {
         return "is_showing_bottom";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java
index 8539e056f2..23853d7e5b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java
@@ -39,11 +39,6 @@ public static EntityItem getFrom(ObjectTag entity) {
             "item"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityItem(EntityTag entity) {
         item = entity;
     }
@@ -63,10 +58,6 @@ else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13) && item.getBukkitEn
         }
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         ItemTag item = getItem();
@@ -83,10 +74,6 @@ public String getPropertyId() {
         return "item";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java
index 5fa73443f3..f1207574ed 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java
@@ -33,21 +33,12 @@ public static EntityJumpStrength getFrom(ObjectTag entity) {
             "jump_strength"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityJumpStrength(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(((AbstractHorse) entity.getBukkitEntity()).getJumpStrength());
@@ -58,11 +49,6 @@ public String getPropertyId() {
         return "jump_strength";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityKnockback.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityKnockback.java
index f45dc6371f..49775d3af2 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityKnockback.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityKnockback.java
@@ -31,21 +31,12 @@ public static EntityKnockback getFrom(ObjectTag entity) {
             "knockback"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityKnockback(EntityTag entity) {
         arrow = entity;
     }
 
     EntityTag arrow;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(((Arrow) arrow.getBukkitEntity()).getKnockbackStrength());
@@ -56,10 +47,6 @@ public String getPropertyId() {
         return "knockback";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMarker.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMarker.java
index 757365d12c..250175692a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMarker.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMarker.java
@@ -32,21 +32,12 @@ public static EntityMarker getFrom(ObjectTag entity) {
             "marker"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityMarker(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!((ArmorStand) dentity.getBukkitEntity()).isMarker()) {
@@ -62,10 +53,6 @@ public String getPropertyId() {
         return "marker";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMaxFuseTicks.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMaxFuseTicks.java
index a0caa967b6..e495d136f9 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMaxFuseTicks.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityMaxFuseTicks.java
@@ -32,21 +32,12 @@ public static EntityMaxFuseTicks getFrom(ObjectTag object) {
             "max_fuse_ticks"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityMaxFuseTicks(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(((Creeper) entity.getBukkitEntity()).getMaxFuseTicks());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPainting.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPainting.java
index 8f73ee2ecb..86811c739e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPainting.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPainting.java
@@ -33,21 +33,12 @@ public static EntityPainting getFrom(ObjectTag entity) {
             "painting"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityPainting(EntityTag entity) {
         painting = entity;
     }
 
     EntityTag painting;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return ((Painting) painting.getBukkitEntity()).getArt().name();
@@ -58,10 +49,6 @@ public String getPropertyId() {
         return "painting";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java
index 15b9d788e2..8fda0de0c8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java
@@ -30,21 +30,12 @@ public static EntityPickupStatus getFrom(ObjectTag entity) {
             "pickup_status"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityPickupStatus(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return NMSHandler.getEntityHelper().getArrowPickupStatus(dentity.getBukkitEntity());
@@ -55,10 +46,6 @@ public String getPropertyId() {
         return "pickup_status";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotion.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotion.java
index 81786d6145..f00cd8e5be 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotion.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotion.java
@@ -42,11 +42,6 @@ public static EntityPotion getFrom(ObjectTag entity) {
             "potion"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     EntityTag entity;
 
     private EntityPotion(EntityTag entity) {
@@ -75,11 +70,6 @@ public void setPotion(ItemStack item) {
         }
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return new ItemTag(getPotion()).identify();
@@ -90,11 +80,6 @@ public String getPropertyId() {
         return "potion";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
         if (attribute == null) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotionEffects.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotionEffects.java
index a12a34a7bf..ee86a4a809 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotionEffects.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPotionEffects.java
@@ -45,11 +45,6 @@ public static EntityPotionEffects getFrom(ObjectTag object) {
             "potion_effects"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityPotionEffects(EntityTag entity) {
         this.entity = entity;
     }
@@ -66,10 +61,6 @@ else if (entity.getBukkitEntity() instanceof Arrow) {
         return new ArrayList<>();
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     public String getPropertyString() {
         Collection<PotionEffect> effects = getEffectsList();
         if (effects.isEmpty()) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPowered.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPowered.java
index c4077c2374..203a289bd4 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPowered.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPowered.java
@@ -32,11 +32,6 @@ public static EntityPowered getFrom(ObjectTag entity) {
             "powered"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityPowered(EntityTag entity) {
         powered = entity;
     }
@@ -55,10 +50,6 @@ private void setPowered(boolean power) {
         ((Creeper) (powered.getBukkitEntity())).setPowered(power);
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!getPowered()) {
@@ -74,10 +65,6 @@ public String getPropertyId() {
         return "powered";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java
index da324fb547..02ce151775 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java
@@ -40,11 +40,6 @@ public static EntityProfession getFrom(ObjectTag entity) {
             "profession"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityProfession(EntityTag entity) {
         professional = entity;
     }
@@ -67,11 +62,6 @@ public void setProfession(Villager.Profession profession) {
         }
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return CoreUtilities.toLowerCase(getProfession().name());
@@ -82,11 +72,6 @@ public String getPropertyId() {
         return "profession";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPumpkinHead.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPumpkinHead.java
index 95115e8539..d632a57db0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPumpkinHead.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPumpkinHead.java
@@ -32,21 +32,12 @@ public static EntityPumpkinHead getFrom(ObjectTag entity) {
             "has_pumpkin_head"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityPumpkinHead(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return String.valueOf(!((Snowman) dentity.getBukkitEntity()).isDerp());
@@ -57,10 +48,6 @@ public String getPropertyId() {
         return "has_pumpkin_head";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java
index c72f4c6ca1..9be27043f3 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java
@@ -30,21 +30,12 @@ public static EntityRiptide getFrom(ObjectTag object) {
             "is_using_riptide"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityRiptide(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return entity.getLivingEntity().isRiptiding() ? "true" : null;
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java
index 2b592493d0..d52a9ec28b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java
@@ -40,11 +40,6 @@ public static EntityRotation getFrom(ObjectTag entity) {
             "rotation"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityRotation(EntityTag entity) {
         this.entity = entity;
     }
@@ -59,11 +54,6 @@ public void setRotation(BlockFace direction) {
         ((Hanging) entity.getBukkitEntity()).setFacingDirection(direction, true);
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return CoreUtilities.toLowerCase(getRotation().name());
@@ -74,11 +64,6 @@ public String getPropertyId() {
         return "rotation";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java
index e36d45cb80..14a69818c0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java
@@ -30,21 +30,12 @@ public static EntitySilent getFrom(ObjectTag entity) {
             "silent"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySilent(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return entity.getBukkitEntity().isSilent() ? "true" : null;
@@ -55,11 +46,6 @@ public String getPropertyId() {
         return "silent";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySitting.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySitting.java
index 0e098d240e..559d4d5b12 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySitting.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySitting.java
@@ -32,21 +32,12 @@ public static EntitySitting getFrom(ObjectTag entity) {
             "sitting"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySitting(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (((Sittable) entity.getBukkitEntity()).isSitting()) {
@@ -60,10 +51,6 @@ public String getPropertyId() {
         return "sitting";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySize.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySize.java
index 51a6a4e06b..ddd756e898 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySize.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySize.java
@@ -37,21 +37,12 @@ public static EntitySize getFrom(ObjectTag entity) {
             "size"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySize(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13) && entity.getBukkitEntity() instanceof Phantom) {
@@ -65,11 +56,6 @@ public String getPropertyId() {
         return "size";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySkeleton.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySkeleton.java
index e5f4adc894..ec2129a747 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySkeleton.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySkeleton.java
@@ -33,21 +33,12 @@ public static EntitySkeleton getFrom(ObjectTag entity) {
             "skeleton"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySkeleton(EntityTag entity) {
         skeleton = entity;
     }
 
     EntityTag skeleton;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return ((Skeleton) skeleton.getBukkitEntity()).getSkeletonType().name();
@@ -58,10 +49,6 @@ public String getPropertyId() {
         return "skeleton";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java
index 2807060666..86e42a5ee7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java
@@ -33,21 +33,12 @@ public static EntitySmall getFrom(ObjectTag entity) {
             "is_small"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySmall(EntityTag entity) {
         this.entity = entity;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (((ArmorStand) entity.getBukkitEntity()).isSmall()) {
@@ -61,11 +52,6 @@ public String getPropertyId() {
         return "small";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java
index 26c40a3cce..5370663b12 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java
@@ -51,21 +51,12 @@ public static EntitySpeed getFrom(ObjectTag entity) {
             "speed"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySpeed(EntityTag ent) {
         entity = ent;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return getSpeed().asString();
@@ -98,11 +89,6 @@ else if (entityType == EntityType.MINECART
         return new ElementTag(0.0);
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
index 350135a88f..690880e004 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
@@ -31,21 +31,12 @@ public static EntitySpell getFrom(ObjectTag entity) {
             "spell"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntitySpell(EntityTag entity) {
         dentity = entity;
     }
 
     EntityTag dentity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return ((Spellcaster) dentity.getBukkitEntity()).getSpell().toString();
@@ -56,10 +47,6 @@ public String getPropertyId() {
         return "spell";
     }
 
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java
index f06bb6fdd8..0e5fc05fd7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java
@@ -37,21 +37,12 @@ public static EntityTame getFrom(ObjectTag entity) {
             "tame", "owner"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityTame(EntityTag tame) {
         entity = tame;
     }
 
     EntityTag entity;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (((Tameable) entity.getBukkitEntity()).isTamed()) {
@@ -73,11 +64,6 @@ public String getPropertyId() {
         return "tame";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java
index de2af2cf7e..8a4d74e4b8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java
@@ -36,11 +36,6 @@ public static EntityVisible getFrom(ObjectTag entity) {
             "visible"
     };
 
-
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     private EntityVisible(EntityTag ent) {
         entity = ent;
         stand = (ArmorStand) ent.getBukkitEntity();
@@ -50,10 +45,6 @@ private EntityVisible(EntityTag ent) {
 
     ArmorStand stand;
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!((ArmorStand) entity.getBukkitEntity()).isVisible()) {
@@ -67,11 +58,6 @@ public String getPropertyId() {
         return "visible";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java
index c4821e19ee..202b4471ba 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java
@@ -29,10 +29,6 @@ public static InventoryContents getFrom(ObjectTag inventory) {
             "contents"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
 
     public InventoryContents(InventoryTag inventory) {
@@ -104,11 +100,6 @@ public ListTag getContentsWithLore(String lore, boolean simple) {
         return contents;
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (!inventory.getIdType().equals("generic") && !inventory.isUnique()) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java
index 8b8befdb67..dd9ec604cd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java
@@ -36,10 +36,6 @@ public static InventoryHolder getFrom(ObjectTag inventory) {
             "holder"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
     ObjectTag holder;
 
@@ -133,11 +129,6 @@ public void setHolder(ElementTag element) {
         }
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (holder == null || (inventory.getIdType().equals("generic")
@@ -154,11 +145,6 @@ public String getPropertyId() {
         return "holder";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     public static void registerTags() {
 
         // <--[tag]
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryScriptName.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryScriptName.java
index 72d88beaae..67514039ee 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryScriptName.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryScriptName.java
@@ -25,20 +25,12 @@ public static InventoryScriptName getFrom(ObjectTag inventory) {
             "script_name"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
 
     public InventoryScriptName(InventoryTag inventory) {
         this.inventory = inventory;
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         return inventory.scriptName;
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventorySize.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventorySize.java
index bd572c779c..bcac8d19ad 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventorySize.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventorySize.java
@@ -25,10 +25,6 @@ public static InventorySize getFrom(ObjectTag inventory) {
             "size"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
 
     public InventorySize(InventoryTag inventory) {
@@ -46,11 +42,6 @@ public void setSize(int size) {
         inventory.setSize(size);
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (getSize() > 0 && inventory.getIdType().equals("generic")
@@ -67,11 +58,6 @@ public String getPropertyId() {
         return "size";
     }
 
-
-    ///////////
-    // ObjectTag Attributes
-    ////////
-
     public static void registerTags() {
 
         // <--[tag]
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTitle.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTitle.java
index da94213dde..ff4aba41e6 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTitle.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTitle.java
@@ -26,10 +26,6 @@ public static InventoryTitle getFrom(ObjectTag inventory) {
             "title"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
 
     public InventoryTitle(InventoryTag inventory) {
@@ -51,11 +47,6 @@ else if (!title.startsWith("container.")) {
         return null;
     }
 
-
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         // Only show a property string for titles that can actually change
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java
index 7d5431a5d7..7c36747e49 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java
@@ -25,20 +25,12 @@ public static InventoryUniquifier getFrom(ObjectTag inventory) {
             "uniquifier"
     };
 
-    ///////////////////
-    // Instance Fields and Methods
-    /////////////
-
     InventoryTag inventory;
 
     public InventoryUniquifier(InventoryTag inventory) {
         this.inventory = inventory;
     }
 
-    /////////
-    // Property Methods
-    ///////
-
     @Override
     public String getPropertyString() {
         if (inventory.uniquifier == null) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchable.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchable.java
index c251b606a6..d405f74883 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchable.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchable.java
@@ -117,7 +117,7 @@ public void adjust(Mechanism mechanism) {
         // <--[mechanism]
         // @object MaterialTag
         // @name switched
-        // @input ElementTag(boolean)
+        // @input ElementTag(Boolean)
         // @description
         // Sets whether a Powerable material (like pressure plates) or an Openable material (like doors), or a dispenser is switched.
         // @tags
diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
index 4febe9f22d..6c6e0124d9 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -370,7 +370,7 @@ else if (recipe instanceof CookingRecipe<?>) {
 
         // <--[tag]
         // @attribute <server.object_is_valid[<object>]>
-        // @returns ElementTag(boolean)
+        // @returns ElementTag(Boolean)
         // @description
         // Returns whether the object is a valid object (non-null), as well as not an Element.
         // -->
@@ -382,7 +382,7 @@ else if (recipe instanceof CookingRecipe<?>) {
 
         // <--[tag]
         // @attribute <server.has_whitelist>
-        // @returns ElementTag(boolean)
+        // @returns ElementTag(Boolean)
         // @description
         // Returns true if the server's whitelist is active, otherwise returns false.
         // -->
@@ -393,7 +393,7 @@ else if (recipe instanceof CookingRecipe<?>) {
 
         // <--[tag]
         // @attribute <server.has_flag[<flag_name>]>
-        // @returns ElementTag(boolean)
+        // @returns ElementTag(Boolean)
         // @description
         // Returns true if the server has the specified flag, otherwise returns false.
         // -->