diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java
index 4893aa0..7eee5cd 100644
--- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java
+++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java
@@ -1,12 +1,9 @@
 package gameEngine.entites.gameComponents;
 
-import gameEngine.Time;
-import gameEngine.entites.Entity;
 import gameEngine.entites.GameObject;
 import gameEngine.input.Input;
 import gameEngine.input.MouseInput;
 import gameEngine.scenes.EditorScene;
-import gameEngine.scenes.Scene;
 import gameEngine.views.Window;
 
 public abstract class Draggable extends GameComponent {
@@ -25,10 +22,10 @@
         float mouseY = MouseInput.getY();
         EditorScene scene = (EditorScene) Window.get().getScene();
 
-        if (scene.getSelectedEntity() == null) {
+        if (scene.getSelectedObject() == null) {
             if (Input.GetMouseButtonDown(0) && isMouseOver(mouseX, mouseY)) {
                 isDragging = true;
-                scene.setSelectedEntity(parent);  // エンティティを選択
+                scene.setSelectedObject(parent);  // エンティティを選択
             }
         }
 
@@ -38,7 +35,7 @@
 
         if (Input.GetMouseButtonUp(0)) {
             isDragging = false;
-            scene.clearSelectedEntity(); // ドラッグ終了時に選択解除
+            scene.clearSelectedObject(); // ドラッグ終了時に選択解除
         }
     }
 
diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java
index 6c1bc2b..f2fdfae 100644
--- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java
+++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java
@@ -1,6 +1,5 @@
 package gameEngine.entites.gameComponents;
 
-import gameEngine.entites.Entity;
 import gameEngine.entites.GameObject;
 import gameEngine.input.Input;
 import gameEngine.input.MouseInput;
@@ -103,7 +102,7 @@
             setText(inputBuffer.toString());
             textRenderer.setColor(Color.WHITE);  // 編集終了時に色を戻す
             EditorScene scene = (EditorScene) Window.get().getScene();
-            scene.clearSelectedEntity();
+            scene.clearSelectedObject();
             inputBuffer.setLength(0);  // バッファをクリア
             return;
         }
diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
index 3f0aac9..dc86adc 100644
--- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
+++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
@@ -8,12 +8,10 @@
 import gameEngine.entites.gameComponents.Draggable;
 import gameEngine.entites.gameComponents.EntityView;
 import gameEngine.entites.gameComponents.TextMesh;
-import gameEngine.input.Input;
 import gameEngine.views.Color;
 import gameEngine.views.Window;
 import org.joml.Vector3f;
 
-import java.awt.event.KeyEvent;
 import java.util.HashMap;
 
 import static org.lwjgl.opengl.GL11.glClearColor;
@@ -22,9 +20,8 @@
 
     private static GameEditor gameEditor;
     public HashMap<String, Entity> editorEntities = new HashMap<>();
-    private Entity selectedEntity = null;
+    private GameObject selectedObject = null;
     public ConnectionManager connectionManager = new ConnectionManager();
-    private Color editorBackColor = new Color(1,1,1,0);
 
     public EditorScene(float windowWidth, float windowHeight){
         System.out.println("Active Editor scene");
@@ -110,30 +107,27 @@
     ///　選択、ドラッグ処理
     ///----------------------------------------------------------------
 
-    public Entity getSelectedEntity() {
-        return selectedEntity;
+    public GameObject getSelectedObject() {
+        return selectedObject;
     }
 
-    public void setSelectedEntity(Entity entity) {
-        selectedEntity = entity;
-        System.out.println("Selected Entity: " + selectedEntity);
+    public void setSelectedObject(GameObject gameObject) {
+        selectedObject = gameObject;
+        System.out.println("Selected Entity: " + selectedObject);
     }
 
-    public void clearSelectedEntity() {
-        selectedEntity = null;
+    public void clearSelectedObject() {
+        selectedObject = null;
     }
 
     public void updateDraggable() {
-        if (selectedEntity != null) {
-            GameObject gameObject = (GameObject) selectedEntity;
-            if (gameObject == null) return;
-            if (gameObject.getComponent(Draggable.class) != null) {
-                gameObject.getComponent(Draggable.class).handleDragging();
+        if (selectedObject != null) {
+            if (selectedObject.getComponent(Draggable.class) != null) {
+                selectedObject.getComponent(Draggable.class).handleDragging();
             }
         } else {
             for (Entity entity : editorEntities.values()) {
-                if (entity instanceof GameObject) {
-                    GameObject gameObject = (GameObject) entity;
+                if (entity instanceof GameObject gameObject) {
                     if (gameObject.getComponent(Draggable.class) != null) {
                         gameObject.getComponent(Draggable.class).handleDragging();
                     }