diff --git a/src/main/java/net/citizensnpcs/api/event/NPCClickEvent.java b/src/main/java/net/citizensnpcs/api/event/NPCClickEvent.java
index 25b4aab9..b471449c 100644
--- a/src/main/java/net/citizensnpcs/api/event/NPCClickEvent.java
+++ b/src/main/java/net/citizensnpcs/api/event/NPCClickEvent.java
@@ -11,7 +11,6 @@
  */
 public abstract class NPCClickEvent extends NPCEvent implements Cancellable {
     private boolean cancelled = false;
-
     private final Player clicker;
 
     protected NPCClickEvent(NPC npc, Player clicker) {
@@ -21,7 +20,7 @@ protected NPCClickEvent(NPC npc, Player clicker) {
 
     /**
      * Gets the player that clicked the NPC.
-     * 
+     *
      * @return Player that clicked the NPC
      */
     public Player getClicker() {
@@ -43,9 +42,9 @@ public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 
-    private static final HandlerList handlers = new HandlerList();
-
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
+    private static final HandlerList handlers = new HandlerList();
 }
\ No newline at end of file
diff --git a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
index 846f6100..ed4a0a88 100644
--- a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
+++ b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
@@ -71,7 +71,7 @@ public File getFile() {
     }
 
     @Override
-    public DataKey getKey(String root) {
+    public NBTKey getKey(String root) {
         return new NBTKey(root);
     }
 
@@ -133,7 +133,7 @@ private String createRelativeKey(String parent, String sub) {
                 return parent;
             if (sub.charAt(0) == '.')
                 return parent.isEmpty() ? sub.substring(1, sub.length()) : parent + sub;
-            return parent.isEmpty() ? sub : parent + "." + sub;
+                return parent.isEmpty() ? sub : parent + "." + sub;
         }
 
         @Override
@@ -181,7 +181,7 @@ private Map<String, Tag> findLastParent(String[] parts) {
             Map<String, Tag> map = root;
             for (int i = 0; i < parts.length - 1; ++i) {
                 if (!map.containsKey(parts[i]) || !(map.get(parts[i]) instanceof CompoundTag))
-                    return null;
+                    return Collections.emptyMap();
                 map = ((CompoundTag) map.get(parts[i])).getValue();
             }
             return map;