diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index 46c124b0a..86c0fef7b 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -314,7 +314,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
                     return goalCount;
                 }
             });
-
             traitFactory.addPlotters(metrics.createGraph("traits"));
             saves.addPlotters(metrics.createGraph("Storage type"));
             metrics.start();
@@ -333,9 +332,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
     public void storeNPCs(CommandContext args) {
         storeNPCs();
         boolean async = args.hasFlag('a');
-        if (async)
+        if (async) {
             saves.saveToDisk();
-        else
+        } else
             saves.saveToDiskImmediate();
     }
 
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index d3e18d2a0..f72f304c6 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -1,6 +1,7 @@
 package net.citizensnpcs.npc;
 
 import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -36,6 +37,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 public class CitizensNPC extends AbstractNPC {
     private EntityController entityController;
@@ -99,13 +101,13 @@ public class CitizensNPC extends AbstractNPC {
         // Load traits
 
         String traitNames = root.getString("traitnames");
-        Iterable<DataKey> keys = traitNames.isEmpty() ? root.getRelative("traits").getSubKeys() : Iterables.transform(
-                Splitter.on(',').split(traitNames), new Function<String, DataKey>() {
-                    @Override
-                    public DataKey apply(@Nullable String input) {
-                        return root.getRelative("traits." + input);
-                    }
-                });
+        Set<DataKey> keys = Sets.newHashSet(root.getRelative("traits").getSubKeys());
+        Iterables.addAll(keys, Iterables.transform(Splitter.on(',').split(traitNames), new Function<String, DataKey>() {
+            @Override
+            public DataKey apply(@Nullable String input) {
+                return root.getRelative("traits." + input);
+            }
+        }));
         for (DataKey traitKey : keys) {
             if (traitKey.keyExists("enabled") && !traitKey.getBoolean("enabled")
                     && traitKey.getRaw("enabled") instanceof Boolean) {