diff --git a/src/main/java/gregtech/api/items/toolitem/IGTTool.java b/src/main/java/gregtech/api/items/toolitem/IGTTool.java
index 713a7b90af7..81d5459b595 100644
--- a/src/main/java/gregtech/api/items/toolitem/IGTTool.java
+++ b/src/main/java/gregtech/api/items/toolitem/IGTTool.java
@@ -153,7 +153,7 @@ default ItemStack getRaw() {
 
     /**
      * @return A tool made from the given material. The tool property (at least overriding) for the material must be
-     * set.
+     *         set.
      */
     default ItemStack get(Material material) {
         ItemStack stack = new ItemStack(get());
diff --git a/src/main/java/gregtech/api/unification/material/materials/SoftToolAddition.java b/src/main/java/gregtech/api/unification/material/materials/SoftToolAddition.java
index a849e4de317..c8672d92c89 100644
--- a/src/main/java/gregtech/api/unification/material/materials/SoftToolAddition.java
+++ b/src/main/java/gregtech/api/unification/material/materials/SoftToolAddition.java
@@ -2,11 +2,10 @@
 
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.recipes.ModHandler;
-import gregtech.api.unification.material.properties.ExtraToolProperty;
-import gregtech.api.unification.material.properties.PropertyKey;
-
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.Materials;
+import gregtech.api.unification.material.properties.ExtraToolProperty;
+import gregtech.api.unification.material.properties.PropertyKey;
 
 public class SoftToolAddition {
 
@@ -21,7 +20,6 @@ private static ExtraToolProperty ensureExtraToolProperty(Material material) {
         return material.getProperty(PropertyKey.EXTRATOOL);
     }
 
-
     public static void register() {
         for (int i = 0; i < softMaterials.length; i++) {
 
diff --git a/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java
index ac2172cdd22..d8c6eca4872 100644
--- a/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java
+++ b/src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java
@@ -113,7 +113,8 @@ public static Builder of(int durability) {
 
         public static Builder of(float harvestSpeed, float attackDamage, int durability, int harvestLevel) {
             Builder builder = new Builder();
-            builder.harvestSpeed(harvestSpeed).attackDamage(attackDamage).durability(durability).harvestLevel(harvestLevel);
+            builder.harvestSpeed(harvestSpeed).attackDamage(attackDamage).durability(durability)
+                    .harvestLevel(harvestLevel);
             return builder;
         }
 
diff --git a/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java b/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java
index 05e24d16651..4306d000ba7 100644
--- a/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java
+++ b/src/main/java/gregtech/api/unification/material/properties/PropertyKey.java
@@ -14,7 +14,8 @@ public class PropertyKey<T extends IMaterialProperty> {
             ItemPipeProperties.class);
     public static final PropertyKey<OreProperty> ORE = new PropertyKey<>("ore", OreProperty.class);
     public static final PropertyKey<ToolProperty> TOOL = new PropertyKey<>("tool", ToolProperty.class);
-    public static final PropertyKey<ExtraToolProperty> EXTRATOOL = new PropertyKey<>("extra_tool", ExtraToolProperty.class);
+    public static final PropertyKey<ExtraToolProperty> EXTRATOOL = new PropertyKey<>("extra_tool",
+            ExtraToolProperty.class);
     public static final PropertyKey<RotorProperty> ROTOR = new PropertyKey<>("rotor", RotorProperty.class);
     public static final PropertyKey<WireProperties> WIRE = new PropertyKey<>("wire", WireProperties.class);
     public static final PropertyKey<WoodProperty> WOOD = new PropertyKey<>("wood", WoodProperty.class);
diff --git a/src/main/java/gregtech/api/unification/material/properties/SimpleToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/SimpleToolProperty.java
index 894ad7aec50..c672f726298 100644
--- a/src/main/java/gregtech/api/unification/material/properties/SimpleToolProperty.java
+++ b/src/main/java/gregtech/api/unification/material/properties/SimpleToolProperty.java
@@ -2,11 +2,11 @@
 
 import gregtech.api.items.toolitem.EnchantmentLevel;
 
+import net.minecraft.enchantment.Enchantment;
+
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 
-import net.minecraft.enchantment.Enchantment;
-
 public class SimpleToolProperty {
 
     /**
diff --git a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java
index fefa498ac07..e1c4de1f0a0 100644
--- a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java
+++ b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java
@@ -2,14 +2,8 @@
 
 import net.minecraft.enchantment.Enchantment;
 
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
 public class ToolProperty extends SimpleToolProperty implements IMaterialProperty {
 
-
     public ToolProperty(float harvestSpeed, float attackDamage, int durability, int harvestLevel) {
         super(harvestSpeed, attackDamage, durability, harvestLevel);
         this.setToolEnchantability(10);