diff --git a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java
index e11e7088..e4cb62d2 100644
--- a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java
+++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidGson.java
@@ -6,7 +6,15 @@ import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 public class IdStrategyOidGson extends IdStrategyAbstract<ObjectId, String>
 {
 	// -------------------------------------------- //
-	// IMPLEMENTATION
+	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
+	
+	private static IdStrategyOidGson i = new IdStrategyOidGson();
+	public static IdStrategyOidGson get() { return i; }
+	private IdStrategyOidGson() { super("oid", ObjectId.class, String.class); }
+	
+	// -------------------------------------------- //
+	// OVERRIDE
 	// -------------------------------------------- //
 	
 	@Override public String localToRemote(Object local) { return ((ObjectId)local).toStringBabble(); }
@@ -18,22 +26,4 @@ public class IdStrategyOidGson extends IdStrategyAbstract<ObjectId, String>
 		return ObjectId.get();
 	}
 	
-	//----------------------------------------------//
-	// CONSTRUCTORS
-	//----------------------------------------------//
-	
-	private IdStrategyOidGson()
-	{
-		super("oid", ObjectId.class, String.class);
-	}
-	
-	// -------------------------------------------- //
-	// INSTANCE
-	// -------------------------------------------- //
-	
-	protected static IdStrategyOidGson instance = new IdStrategyOidGson();
-	public static IdStrategyOidGson get()
-	{
-		return instance;
-	}
 }
diff --git a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java
index 2bb44d23..66ec6365 100644
--- a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java
+++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyOidMongo.java
@@ -6,7 +6,15 @@ import com.massivecraft.mcore.xlib.bson.types.ObjectId;
 public class IdStrategyOidMongo extends IdStrategyAbstract<ObjectId, ObjectId>
 {
 	// -------------------------------------------- //
-	// IMPLEMENTATION
+	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
+	
+	private static IdStrategyOidMongo i = new IdStrategyOidMongo();
+	public static IdStrategyOidMongo get() { return i; }
+	private IdStrategyOidMongo() { super("oid", ObjectId.class, ObjectId.class); }
+	
+	// -------------------------------------------- //
+	// OVERRIDE
 	// -------------------------------------------- //
 	
 	@Override public ObjectId localToRemote(Object local) { return (ObjectId)local; }
@@ -17,24 +25,5 @@ public class IdStrategyOidMongo extends IdStrategyAbstract<ObjectId, ObjectId>
 	{
 		return ObjectId.get();
 	}
-	
-	//----------------------------------------------//
-	// CONSTRUCTORS
-	//----------------------------------------------//
-	
-	private IdStrategyOidMongo()
-	{
-		super("oid", ObjectId.class, ObjectId.class);
-	}
-	
-	// -------------------------------------------- //
-	// INSTANCE
-	// -------------------------------------------- //
-	
-	protected static IdStrategyOidMongo instance = new IdStrategyOidMongo();
-	public static IdStrategyOidMongo get()
-	{
-		return instance;
-	}
 
 }
diff --git a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java
index 8d74e890..66051f10 100644
--- a/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java
+++ b/src/com/massivecraft/mcore/store/idstrategy/IdStrategyUuidMongoAndGson.java
@@ -7,7 +7,15 @@ import com.massivecraft.mcore.store.CollInterface;
 public class IdStrategyUuidMongoAndGson extends IdStrategyAbstract<UUID, String>
 {
 	// -------------------------------------------- //
-	// IMPLEMENTATION
+	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
+	
+	private static IdStrategyUuidMongoAndGson i = new IdStrategyUuidMongoAndGson();
+	public static IdStrategyUuidMongoAndGson get() { return i; }
+	private IdStrategyUuidMongoAndGson() { super("uuid", UUID.class, String.class); }
+	
+	// -------------------------------------------- //
+	// OVERRIDE
 	// -------------------------------------------- //
 	
 	@Override public String localToRemote(Object local) { return ((UUID)local).toString(); }
@@ -19,22 +27,4 @@ public class IdStrategyUuidMongoAndGson extends IdStrategyAbstract<UUID, String>
 		return UUID.randomUUID();
 	}
 	
-	//----------------------------------------------//
-	// CONSTRUCTORS
-	//----------------------------------------------//
-	
-	private IdStrategyUuidMongoAndGson()
-	{
-		super("uuid", UUID.class, String.class);
-	}
-	
-	// -------------------------------------------- //
-	// INSTANCE
-	// -------------------------------------------- //
-	
-	protected static IdStrategyUuidMongoAndGson instance = new IdStrategyUuidMongoAndGson();
-	public static IdStrategyUuidMongoAndGson get()
-	{
-		return instance;
-	}
 }