diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs
index 8ae35ba..51c0d44 100644
--- a/Assets/Entities/Scripts/EntityBase.cs
+++ b/Assets/Entities/Scripts/EntityBase.cs
@@ -15,7 +15,6 @@ namespace AsteroidGame.Entities
         [Header("UI")]
         [SerializeField] protected string _uiFriendlyName;
 
-
         #region Props
 
         public string UiFriendlyName => _uiFriendlyName;
@@ -30,17 +29,15 @@ namespace AsteroidGame.Entities
 
             AssignDamageable();
         }
-        
+
         private void InitializeDamageable()
         {
-            if (Damageable != null) return;
-            Damageable = gameObject.AddComponent<Damageable>();
+            Damageable ??= gameObject.AddComponent<Damageable>();
         }
 
         private void InitializeTargetable()
         {
-            if (Targetable != null) return;
-            Targetable = gameObject.AddComponent<Targetable>();
+            Targetable ??= gameObject.AddComponent<Targetable>();
         }
 
         private void AssignDamageable()
diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs
index 6bcdc7d..fca19c0 100644
--- a/Assets/Entities/Structures/Scripts/StructureBase.cs
+++ b/Assets/Entities/Structures/Scripts/StructureBase.cs
@@ -32,8 +32,8 @@ namespace AsteroidGame.Entities
 
         private void InitializePower()
         {
-            _power = gameObject.AddComponent<PowerBase>();
-            _power.SetConfig(_powerConfig);
+            _power ??= gameObject.AddComponent<PowerBase>();
+            _power.Initialize(_powerConfig);
         }
 
         protected void OnDisable()