diff --git a/src/com/sekwah/advancedportals/core/api/managers/PortalManager.java b/src/com/sekwah/advancedportals/core/api/managers/PortalManager.java
index fd710913..78e12447 100644
--- a/src/com/sekwah/advancedportals/core/api/managers/PortalManager.java
+++ b/src/com/sekwah/advancedportals/core/api/managers/PortalManager.java
@@ -31,10 +31,10 @@ public class PortalManager {
     /**
      * Tracks the name of portal a player has selected
      */
-    private HashMap<String, String> selectedPortal = new HashMap();
+    private HashMap<String, String> selectedPortal = new HashMap<>();
 
-    private HashMap<String, PortalLocation> portalSelectorLeftClick = new HashMap();
-    private HashMap<String, PortalLocation> portalSelectorRightClick = new HashMap();
+    private HashMap<String, PortalLocation> portalSelectorLeftClick = new HashMap<>();
+    private HashMap<String, PortalLocation> portalSelectorRightClick = new HashMap<>();
 
     /**
      * Contains all the data for the portals
diff --git a/src/com/sekwah/advancedportals/core/util/DataStorage.java b/src/com/sekwah/advancedportals/core/util/DataStorage.java
index ae3e20b8..77044449 100644
--- a/src/com/sekwah/advancedportals/core/util/DataStorage.java
+++ b/src/com/sekwah/advancedportals/core/util/DataStorage.java
@@ -83,7 +83,7 @@ public class DataStorage {
         }
         if (!outFile.exists() || overwrite) {
             try {
-                InputStream inputStream = DataStorage.class.getClassLoader().getResourceAsStream(fileLoc);
+                InputStream inputStream = DataStorage.class.getResourceAsStream(fileLoc);
                 if(inputStream == null) {
                     return false;
                 }