diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3193cfcc1b..d29aeaac21 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4242,20 +4242,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index b3cf621f36..252d789aee 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4248,20 +4248,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0c6b86529e..81dfae94e6 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4250,20 +4250,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0df481031c..eaabcf174b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4245,20 +4245,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 735f0a8b38..625bf56bd5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4223,20 +4223,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6920dddc0f..f4d8aef511 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4223,20 +4223,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 39ec19c7ff..7b040e1c0a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4224,20 +4224,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 533819504c..8c0b67a3a9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4139,20 +4139,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5c7916a79e..c4e2fdd1a5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -5588,34 +5588,16 @@ public class PlayerInstance extends Playable
 	}
 	
 	/**
-	 * Return the Alliance Identifier of the PlayerInstance.<BR>
-	 * <BR>
-	 * @return the ally id
+	 * @return the Alliance Identifier of the PlayerInstance.
 	 */
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
-	/**
-	 * Gets the ally crest id.
-	 * @return the ally crest id
-	 */
 	public int getAllyCrestId()
 	{
-		if ((getClanId() == 0) || (getClan() == null))
-		{
-			return 0;
-		}
-		if (getClan().getAllyId() == 0)
-		{
-			return 0;
-		}
-		return getClan().getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 72048f50fe..7f8638979c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4315,7 +4315,7 @@ public class PlayerInstance extends Playable
 	
 	public int getAllyCrestId()
 	{
-		return (_clanId == 0) || (_clan.getAllyId() == 0) ? 0 : _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ba4e98f00e..ea1135991a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4202,7 +4202,7 @@ public class PlayerInstance extends Playable
 	
 	public int getAllyCrestId()
 	{
-		return (_clanId == 0) || (_clan.getAllyId() == 0) ? 0 : _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7d12d198d2..d0729fc9c4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4217,20 +4217,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 362aaf88be..6b1874d9f5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4218,20 +4218,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9c3ce205eb..2a2b57cd7f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4201,20 +4201,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 305d04ed02..1d1814f6c6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4212,20 +4212,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index fe0c5c34a2..3fde02af65 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4212,20 +4212,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6d39885389..b6741ff010 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4110,20 +4110,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index f02dc9b011..f12dff6c96 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -4218,20 +4218,12 @@ public class PlayerInstance extends Playable
 	@Override
 	public int getAllyId()
 	{
-		if (_clan == null)
-		{
-			return 0;
-		}
-		return _clan.getAllyId();
+		return _clan == null ? 0 : _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
 	{
-		if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
-		{
-			return 0;
-		}
-		return _clan.getAllyCrestId();
+		return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
 	}
 	
 	/**