diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java
index 8df15232..9825042e 100644
--- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java
@@ -11,7 +11,6 @@ import lombok.Getter;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
index 9af120bf..c80eac69 100644
--- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
@@ -134,7 +134,7 @@ public class BloodAltar {
 
         if (altarComponent.getBlockStack().getBlock() == ModBlocks.crystal)
             if (blockStack.getBlock() instanceof BlockCrystal || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.CRYSTAL)))
-            return true;
+                return true;
 
         if (altarComponent.getBlockStack().getBlock() == Blocks.glowstone)
             if (blockStack.getBlock() instanceof BlockGlowstone || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.GLOWSTONE)))
diff --git a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java
index 4d11d6b3..3ee5368a 100644
--- a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java
+++ b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java
@@ -4,8 +4,11 @@ import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
+import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.fml.common.eventhandler.Event;
 
@@ -23,8 +26,8 @@ public class RitualEvent extends Event {
 
     /**
      * This event is called when a ritual is activated. If cancelled, it will not activate.
-     * <p/>
-     * {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#activate(IMasterRitualStone, Ritual, EntityPlayer)}
+     *
+     * {@link TileMasterRitualStone#activateRitual(ItemStack, EntityPlayer)}
      */
     @Cancelable
     public static class RitualActivatedEvent extends RitualEvent {
@@ -43,8 +46,8 @@ public class RitualEvent extends Event {
 
     /**
      * This event is called when a Ritual effect is performed. If cancelled, the effect will not happen.
-     * <p/>
-     * {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#perform(IMasterRitualStone, Ritual)}
+     *
+     * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos, Ritual)}
      */
     @Cancelable
     public static class RitualRunEvent extends RitualEvent {
@@ -56,8 +59,8 @@ public class RitualEvent extends Event {
 
     /**
      * This event is called when a Ritual is stopped by a {@link Ritual.BreakType}.
-     * <p/>
-     * {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#stop(IMasterRitualStone, Ritual, Ritual.BreakType)}
+     *
+     * {@link TileMasterRitualStone#stopRitual()}
      */
     public static class RitualStopEvent extends RitualEvent {
 
diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java
index 65352ef8..d2dc3cbc 100644
--- a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java
+++ b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java
@@ -10,7 +10,7 @@ public interface IBindable {
 
     /**
      * Called when the player attempts to bind the item.
-     * <p/>
+     *
      * If false, binding fails.
      */
     boolean onBind(EntityPlayer player, ItemStack stack);
diff --git a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java
index 650cdf57..d28b1a0a 100644
--- a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java
+++ b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java
@@ -94,7 +94,7 @@ public class SoulNetwork extends WorldSavedData {
     /**
      * If the player exists on the server, syphon the given amount of LP from the player's LP network and
      * damage for any remaining LP required.
-     * <p/>
+     *
      * Always returns false on the client side.
      *
      * @return - Whether the action should be performed.
diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
index 6d02707f..393b36cc 100644
--- a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
+++ b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
@@ -4,7 +4,7 @@ import WayofTime.bloodmagic.api.registry.OrbRegistry;
 
 /**
  * Base object for all Blood Orbs. Makes Orb creation quite a bit easier.
- * <p/>
+ *
  * Just create a new BloodOrb instance then register it with {@link OrbRegistry#registerOrb(BloodOrb)}
  * This will allow the use of just one item ID for all orbs. If an addon dev needs more control over the intricacies
  * of their orb (custom right clicking, renderers, etc), they can just create their own item as normal.
diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java
index 15f10ebf..cabace10 100644
--- a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java
@@ -25,9 +25,9 @@ public class BindableHelper {
 
     /**
      * Bind an item to a username.
-     * <p/>
+     *
      * Requires the Item contained in the ItemStack to be an instanceof {@link IBindable}
-     * <p/>
+     *
      * Fires {@link ItemBindEvent}.
      *
      * @param stack     - The ItemStack to bind
diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
index 32a46798..48423394 100644
--- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
@@ -42,12 +42,12 @@ public class RitualHelper {
     /**
      * Adds your Ritual to the {@link RitualRegistry#enabledRituals} Map.
      * This is used to determine whether your effect is enabled or not.
-     * <p/>
+     *
      * The config option will be created as {@code B:ClassName=true} with a comment of
      * {@code Enables the ClassName ritual}.
-     * <p/>
+     *
      * Use {@link #}
-     * <p/>
+     *
      * Should be safe to modify at any point.
      *
      * @param config      - Your mod's Forge {@link Configuration} object.
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
index 954bce5a..b66d84c5 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
@@ -6,7 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -30,14 +33,12 @@ public class BlockBloodLight extends Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public EnumWorldBlockLayer getBlockLayer()
-    {
+    public EnumWorldBlockLayer getBlockLayer() {
         return EnumWorldBlockLayer.CUTOUT;
     }
 
     @Override
-    public boolean isFullCube()
-    {
+    public boolean isFullCube() {
         return false;
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
index 611ad265..d7b0f39a 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
@@ -26,9 +26,9 @@ import java.util.List;
 
 /**
  * Creates a block that has multiple meta-based states.
- * <p/>
+ *
  * These states will be numbered 0 through {@code maxMeta}.
- * <p/>
+ *
  * For {@link net.minecraft.tileentity.TileEntity}'s, use {@link BlockIntegerContainer}.
  */
 @Getter
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
index f0cdf5da..3092f4a6 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
@@ -27,10 +27,10 @@ import java.util.List;
 
 /**
  * Creates a block that has multiple meta-based states.
- * <p/>
+ *
  * These states will be named after the given string array. Somewhere along the way, each
  * value is {@code toLowerCase()}'ed, so the blockstate JSON needs all values to be lowercase.
- * <p/>
+ *
  * For {@link net.minecraft.tileentity.TileEntity}'s, use {@link BlockStringContainer}.
  */
 @Getter
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
index a2ad9986..d77fec22 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
@@ -21,14 +21,14 @@ public class BloodMagicPlugin implements IModPlugin {
     @Override
     public Iterable<? extends IRecipeCategory> getRecipeCategories() {
         return Arrays.asList(
-            new AltarRecipeCategory()
+                new AltarRecipeCategory()
         );
     }
 
     @Override
     public Iterable<? extends IRecipeHandler> getRecipeHandlers() {
         return Arrays.asList(
-            new AltarRecipeHandler()
+                new AltarRecipeHandler()
         );
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java
index 6502b2bc..4ad39c40 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java
@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.compat.jei.altar;
 
 import WayofTime.bloodmagic.compat.jei.BloodMagicRecipeWrapper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
-import com.google.common.base.Strings;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 
@@ -25,7 +24,7 @@ public class AltarRecipeJEI extends BloodMagicRecipeWrapper {
         this.input = input;
         this.output = output;
 
-        this.infoString = new String[]{ TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier), TextHelper.localize("jei.BloodMagic.recipe.requiredLP", requiredLP) };
+        this.infoString = new String[]{TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier), TextHelper.localize("jei.BloodMagic.recipe.requiredLP", requiredLP)};
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java
index f5b97161..3f0cea32 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java
@@ -5,7 +5,9 @@ import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
 import net.minecraft.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class AltarRecipeMaker {
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
index b9657b89..a3713c60 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
@@ -15,11 +15,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.BlockPos;
-import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -58,8 +55,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator {
                 setTierToBuild(EnumAltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]);
                 ChatUtil.sendNoSpamClient(TextHelper.localizeEffect("chat.BloodMagic.altarMaker.setTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1));
                 return stack;
-            }
-            else {
+            } else {
                 stack.getTagCompound().setInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER, stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1);
                 setTierToBuild(EnumAltarTier.values()[stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER)]);
                 ChatUtil.sendNoSpamClient(TextHelper.localizeEffect("chat.BloodMagic.altarMaker.setTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1));
@@ -68,7 +64,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator {
         }
 
         MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false);
-        if (mop == null || mop.typeOfHit == MovingObjectPosition.MovingObjectType.MISS || mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) return stack;
+        if (mop == null || mop.typeOfHit == MovingObjectPosition.MovingObjectType.MISS || mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY)
+            return stack;
 
         if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && world.getBlockState(mop.getBlockPos()).getBlock() instanceof BlockAltar) {
 
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java
index 43da7d88..f674cc88 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java
@@ -321,8 +321,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable,
             this.dislocationMultiplier = 1;
             this.accelerationUpgrades = 0;
             return;
-        }
-        else if (!tier.equals(EnumAltarTier.ONE) && upgrade != null) {
+        } else if (!tier.equals(EnumAltarTier.ONE) && upgrade != null) {
             this.isUpgraded = true;
             this.consumptionMultiplier = (float) (0.20 * upgrade.getSpeedCount());
             this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getEfficiencyCount());
diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java
index a6a89a21..840d3b28 100644
--- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java
+++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java
@@ -173,7 +173,7 @@ public class ChatUtil {
     /**
      * Sends a chat message to the client, deleting past messages also sent via
      * this method.
-     * <p/>
+     *
      * Credit to RWTema for the idea
      *
      * @param player The player to send the chat message to
@@ -186,7 +186,7 @@ public class ChatUtil {
 
     /**
      * @author tterrag1098
-     *         <p/>
+     *
      *         Ripped from EnderCore (and slightly altered)
      */
     public static class PacketNoSpamChat implements IMessage {
diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java
index 2a0861a4..204ae060 100644
--- a/src/main/java/WayofTime/bloodmagic/util/Utils.java
+++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java
@@ -22,7 +22,7 @@ public class Utils {
     /**
      * Used for inserting an ItemStack with a stacksize of 1 to a tile's inventory at slot 0.
      * Returns {@code true} if the ItemStack is inserted, {@code false} otherwise
-     * <p/>
+     *
      * EG: Block Altar
      *
      * @param tile   - The {@link TileInventory} to input the item to
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
index afa6028d..74c492b9 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.util.handler;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.block.BlockAltar;
 import WayofTime.bloodmagic.item.ItemAltarMaker;
@@ -14,8 +13,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java
index 8d390b38..00d45bed 100644
--- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java
@@ -14,13 +14,13 @@ import net.minecraftforge.client.model.ModelLoader;
 
 /**
  * @author <a href="https://github.com/TehNut">TehNut</a>
- *         <p/>
+ *
  *         The goal of this class is to make registering the inventory renders
  *         for your Items/Blocks a much simpler and easier process.
- *         <p/>
+ *
  *         You must call this at the post initialization stage on
  *         the clientside only.
- *         <p/>
+ *
  *         If you pass a Block through here that uses the default
  *         ItemBlock, you should specify a custom name.
  */