diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java
index ef11b86657d..a6737aff72d 100644
--- a/src/main/java/mekanism/api/gas/GasRegistry.java
+++ b/src/main/java/mekanism/api/gas/GasRegistry.java
@@ -5,109 +5,78 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class GasRegistry
-{
-	private static ArrayList<Gas> registeredGasses = new ArrayList<Gas>();
-
-	/**
-	 * Register a new gas into GasRegistry.
-	 * @param gas - Gas to register
-	 * @return the gas that has been registered, pulled right out of GasRegistry
-	 */
-	public static Gas register(Gas gas)
-	{
-		if(gas == null)
-		{
-			return null;
-		}
-
-		registeredGasses.add(gas);
-
-		return getGas(gas.getName());
-	}
-
-	/**
-	 * Gets the gas associated with the defined ID.
-	 * @param id - ID to check
-	 * @return gas associated with defined ID
-	 */
-	public static Gas getGas(int id)
-	{
-		if(id == -1)
-		{
-			return null;
-		}
-
-		return registeredGasses.get(id);
-	}
-
-	/**
-	 * Gets the gas associated with the defined fluid.
-	 * @param f - fluid to check
-	 * @return the gas associated with the fluid
-	 */
-	public static Gas getGas(Fluid f)
-	{
-		for(Gas gas : getRegisteredGasses())
-		{
-			if(gas.hasFluid() && gas.getFluid() == f)
-			{
-				return gas;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Whether or not GasRegistry contains a gas with the specified name
-	 * @param name - name to check
-	 * @return if GasRegistry contains a gas with the defined name
-	 */
-	public static boolean containsGas(String name)
-	{
-		return getGas(name) != null;
-	}
-
-	/**
-	 * Gets the list of all gasses registered in GasRegistry.
-	 * @return a cloned list of all registered gasses
-	 */
-	public static List<Gas> getRegisteredGasses()
-	{
-		return (List<Gas>)registeredGasses.clone();
-	}
-
-	/**
-	 * Gets the gas associated with the specified name.
-	 * @param name - name of the gas to get
-	 * @return gas associated with the name
-	 */
-	public static Gas getGas(String name)
-	{
-		for(Gas gas : registeredGasses)
-		{
-			if(gas.getName().toLowerCase().equals(name.toLowerCase()))
-			{
-				return gas;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the gas ID of a specified gas.
-	 * @param gas - gas to get the ID from
-	 * @return gas ID
-	 */
-	public static int getGasID(Gas gas)
-	{
-		if(gas == null || !containsGas(gas.getName()))
-		{
-			return -1;
-		}
-
-		return registeredGasses.indexOf(gas);
-	}
-}
+public class GasRegistry {
+    private static ArrayList<Gas> registeredGasses = new ArrayList<Gas>();
+
+    /**
+     * Register a new gas into GasRegistry.
+     * @param gas - Gas to register
+     * @return the gas that has been registered, pulled right out of GasRegistry
+     */
+    public static Gas register(Gas gas) {
+        if (gas == null) {
+            return null;
+        }
+        registeredGasses.add(gas);
+        return getGas(gas.getName());
+    }
+
+    /**
+     * Gets the gas associated with the defined ID.
+     * @param id - ID to check
+     * @return gas associated with defined ID
+     */
+    public static Gas getGas(int id) {
+        return id == -1 ? null : registeredGasses.get(id);
+    }
+
+    /**
+     * Gets the gas associated with the defined fluid.
+     * @param f - fluid to check
+     * @return the gas associated with the fluid
+     */
+    public static Gas getGas(Fluid f) {
+        return registeredGasses.stream()
+                .filter(gas -> gas.hasFluid() && gas.getFluid() == f)
+                .findAny()
+                .orElse(null);
+    }
+
+    /**
+     * Whether or not GasRegistry contains a gas with the specified name
+     * @param name - name to check
+     * @return if GasRegistry contains a gas with the defined name
+     */
+    public static boolean containsGas(String name) {
+        return getGas(name) != null;
+    }
+
+    /**
+     * Gets the list of all gasses registered in GasRegistry.
+     * @return a cloned list of all registered gasses
+     */
+    public static List<Gas> getRegisteredGasses() {
+        return (List<Gas>)registeredGasses.clone();
+    }
+
+    /**
+     * Gets the gas associated with the specified name.
+     * @param name - name of the gas to get
+     * @return gas associated with the name
+     */
+    public static Gas getGas(String name) {
+        return registeredGasses.stream()
+                .filter(gas -> gas.getName().equalsIgnoreCase(name))
+                .findAny()
+                .orElse(null);
+    }
+
+    /**
+     * Gets the gas ID of a specified gas.
+     * @param gas - gas to get the ID from
+     * @return gas ID
+     */
+    public static int getGasID(Gas gas) {
+        return gas == null || !containsGas(gas.getName()) ? -1 : registeredGasses.indexOf(gas);
+    }
+}
\ No newline at end of file