diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java
index a7d5df2eb..53e03b203 100644
--- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java
+++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java
@@ -19,8 +19,7 @@ import net.minecraftforge.event.world.WorldEvent;
  * @author hbm
  */
 public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
-	
-	private HashMap<World, ThreeDimRadiationPerWorld> perWorld = new HashMap();
+
 	private Map<World, ThreeDimRadiationPerWorld> perWorld = new HashMap<>();
 
 	@Override @Untested
@@ -74,9 +73,7 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
 	public void updateSystem() {
 		
 		for(Entry<World, ThreeDimRadiationPerWorld> entry : perWorld.entrySet()) {
-			
-			HashMap<ChunkCoordIntPair, Float[]> radiation = entry.getValue().radiation;
-			HashMap<ChunkCoordIntPair, Float[]> buff = new HashMap(radiation);
+
 			Map<ChunkCoordIntPair, Float[]> radiation = entry.getValue().radiation;
 			Map<ChunkCoordIntPair, Float[]> buff = new HashMap<>(radiation);
 			radiation.clear();
@@ -186,7 +183,6 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
 	}
 	
 	public static class ThreeDimRadiationPerWorld {
-
 		public Map<ChunkCoordIntPair, Float[]> radiation = new HashMap<>();
 	}
 }
diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java
index 504b0a14e..1bda5f318 100644
--- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java
+++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java
@@ -35,8 +35,7 @@ import net.minecraftforge.event.world.WorldEvent;
 public class ChunkRadiationHandlerNT extends ChunkRadiationHandler {
 	
 	/* once i have to start debugging this, even my nightmares will start shitting themselves */
-	
-	private static HashMap<World, WorldRadiationData> worldMap = new HashMap();
+
 	private static Map<World, WorldRadiationData> worldMap = new HashMap<>();
 
 	@Override
@@ -728,17 +727,13 @@ public class ChunkRadiationHandlerNT extends ChunkRadiationHandler {
 	
 	public static class WorldRadiationData {
 		public World world;
-		private Set<BlockPos> dirtyChunks = new HashSet();
-		private Set<BlockPos> dirtyChunks2 = new HashSet();
 		private Set<BlockPos> dirtyChunks = new HashSet<>();
 		private Set<BlockPos> dirtyChunks2 = new HashSet<>();
 		private boolean iteratingDirty = false;
-		
-		public Set<RadPocket> activePockets = new HashSet();
-		public HashMap<ChunkCoordIntPair, ChunkRadiationStorage> data = new HashMap();
-		
+
 		public Set<RadPocket> activePockets = new HashSet<>();
 		public Map<ChunkCoordIntPair, ChunkRadiationStorage> data = new HashMap<>();
+
 		public WorldRadiationData(World world) {
 			this.world = world;
 		}
diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java
index 43a399e13..0b7c75040 100644
--- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java
+++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java
@@ -45,8 +45,7 @@ import net.minecraftforge.event.world.WorldEvent;
  *
  */
 public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler {
-	
-	public ConcurrentHashMap<World, RadPerWorld> perWorld = new ConcurrentHashMap();
+
 	public Map<World, RadPerWorld> perWorld = new ConcurrentHashMap<>();
 	public static int cycles = 0;
 	
@@ -173,8 +172,7 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler {
 			}
 		}
 	}
-	
-	public static final HashMap<ChunkCoordIntPair, SubChunk[]> newAdditions = new HashMap();
+
 	public static final Map<ChunkCoordIntPair, SubChunk[]> newAdditions = new HashMap<>();
 
 	@Override