diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs
index dbd7125..4872c80 100644
--- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs
+++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs
@@ -23,14 +23,14 @@ namespace SepCore.UI
         {
             GameEntry.Event.Subscribe(SelectRoleReturnEventArgs.EventId, OnSelectRoleReturn);
             GameEntry.Event.Subscribe(SelectRoleHoverEventArgs.EventId, OnSelectRoleHover);
-            GameEntry.Event.Subscribe(SelectRoleConfirmEventArgs.EventId, OnMenuSelectRoleConfirm);
+            GameEntry.Event.Subscribe(SelectRoleConfirmEventArgs.EventId, OnSelectRoleConfirm);
         }
 
         protected override void UnsubscribeCustomEvents()
         {
             GameEntry.Event.Unsubscribe(SelectRoleReturnEventArgs.EventId, OnSelectRoleReturn);
             GameEntry.Event.Unsubscribe(SelectRoleHoverEventArgs.EventId, OnSelectRoleHover);
-            GameEntry.Event.Unsubscribe(SelectRoleConfirmEventArgs.EventId, OnMenuSelectRoleConfirm);
+            GameEntry.Event.Unsubscribe(SelectRoleConfirmEventArgs.EventId, OnSelectRoleConfirm);
         }
 
         private static SelectRoleContext BuildContext(SelectRoleRawData rawData)
@@ -96,37 +96,23 @@ namespace SepCore.UI
             await OpenUIAsync(initialRawData, timeout);
         }
 
-        public async UniTask<int?> OpenUIAsync(SelectRoleRawData rawData, float timeout = 30f)
+        public async UniTask OpenUIAsync(SelectRoleRawData rawData, float timeout = 30f)
         {
             SelectRoleContext context = BuildContext(rawData);
-            return await OpenFormAsync(context, timeout);
+            await OpenFormAsync(context, timeout);
         }
 
         public override void BindUseCase(IUIUseCase useCase)
         {
             if (useCase is not SelectRoleUseCase selectRoleUseCase)
             {
-                Log.Error("SelectRoleUseCase.BindUseCase() useCase is invalid.");
+                Log.Error("SelectRoleController.BindUseCase() useCase is invalid.");
                 return;
             }
 
             _useCase = selectRoleUseCase;
         }
 
-        public void UpdateShowRole(RolePropertyAreaContext rolePropertyAreaContext)
-        {
-            if (Context == null)
-            {
-                Log.Error("SelectRoleController.UpdateShowRole() Context is null.");
-                return;
-            }
-
-            Context.RolePropertyAreaContext = rolePropertyAreaContext;
-            Context.ShowRoleProperty = rolePropertyAreaContext != null;
-
-            Form?.UpdateShowRole(Context.ShowRoleProperty, rolePropertyAreaContext);
-        }
-
         private bool IsCurrentFormEventSender(object sender)
         {
             if (sender is SelectRoleForm selectRoleForm)
@@ -144,12 +130,12 @@ namespace SepCore.UI
 
         private void OnSelectRoleReturn(object sender, GameEventArgs e)
         {
-            if (sender is not SelectRoleForm selectRoleForm || selectRoleForm != Form)
+            if (e is not SelectRoleReturnEventArgs)
             {
                 return;
             }
 
-            if (e is not SelectRoleReturnEventArgs)
+            if (!IsCurrentFormEventSender(sender))
             {
                 return;
             }
@@ -176,7 +162,7 @@ namespace SepCore.UI
         {
             if (_useCase == null)
             {
-                Log.Error("SelectRoleController.OnMenuSelectRoleSelected() useCase is null.");
+                Log.Error("SelectRoleController.OnSelectRoleHoverAsync() useCase is null.");
                 return;
             }
 
@@ -184,7 +170,7 @@ namespace SepCore.UI
             await OpenUIAsync(rawData);
         }
 
-        private void OnMenuSelectRoleConfirm(object sender, GameEventArgs e)
+        private void OnSelectRoleConfirm(object sender, GameEventArgs e)
         {
             if (e is not SelectRoleConfirmEventArgs)
             {
@@ -198,7 +184,7 @@ namespace SepCore.UI
 
             if (_useCase == null)
             {
-                Log.Error("SelectRoleController.OnMenuSelectRoleConfirm() useCase is null.");
+                Log.Error("SelectRoleController.OnSelectRoleConfirm() useCase is null.");
                 return;
             }
 
diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs
index 903d188..ad7ec2c 100644
--- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs
+++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs
@@ -76,7 +76,7 @@ namespace SepCore.UI
 
         #endregion
 
-        public void UpdateShowRole(bool showRoleProperty, RolePropertyAreaContext propertyAreaContext)
+        private void UpdateShowRole(bool showRoleProperty, RolePropertyAreaContext propertyAreaContext)
         {
             if (!showRoleProperty)
             {