diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs
index d03bfb2..328f530 100644
--- a/Assets/Scripts/Astronaut.cs
+++ b/Assets/Scripts/Astronaut.cs
@@ -44,18 +44,7 @@ public class Astronaut : MonoBehaviour {
 			if (oldState == AstronautState.Dashing)
             {
                 _astronautAnimator.Land();
-                //SpriteWalk.gameObject.SetActive(false);
-                //SpriteDash.gameObject.SetActive(true);
 			}
-            //else if (_state == AstronautState.Jumping)
-            //{
-            //    _astronautAnimator.Jump();
-            //}
-		    /*else
-            {
-                SpriteWalk.gameObject.SetActive(true);
-                SpriteDash.gameObject.SetActive(false);
-			}*/
             
 			if (State == AstronautState.Walking)
 			{
@@ -152,6 +141,7 @@ public class Astronaut : MonoBehaviour {
 			if (State == AstronautState.Dashing)
 			{
                 planet.PushWedge(this.theta);
+                State = AstronautState.Idle;
             }
 
 			height = radius;
@@ -161,43 +151,7 @@ public class Astronaut : MonoBehaviour {
 			if (State < AstronautState.Ejecting) vSpeed = 0f;
 		}
 
-
-		UpdatePosition();
-
-		//float x, y;
-		//
-		//PlanetUtilities.Spheric2Cartesian(theta, heightAtPos, out x, out y);
-		//
-		//
-
-        /*
-		if (State == AstronautState.Walking)
-		{
-			walkTime += Time.deltaTime / StepTime;
-			Vector3 rotation = transform.rotation.eulerAngles;
-    			rotation.z = Mathf.Sin(walkTime * Mathf.PI)*50;			transform.rotation = Quaternion.Euler(rotation);
-		}*/
-
-		/*
-		switch (State)
-		{
-			case AstronautState.Dashing:
-
-				break;
-			case AstronautState.Ejecting:
-
-				break;
-			case AstronautState.Idle:
-
-				break;
-			case AstronautState.Jumping:
-
-				break;
-			case AstronautState.Walking:
-
-				break;
-		}
-		 */
+		UpdatePosition();		
 	}
 
 	public void Move(float x, float y)
@@ -212,7 +166,7 @@ public class Astronaut : MonoBehaviour {
 
         float move = proj;
 
-		if (State >= AstronautState.Ejecting )
+		if (State >= AstronautState.Dashing )
 			return;
 
 		if (State < AstronautState.Jumping)
@@ -255,17 +209,15 @@ public class Astronaut : MonoBehaviour {
 
 	public void Jump()
 	{
+        if (State >= AstronautState.Dashing)
+            return;
+
 	    if (State == AstronautState.Jumping)
 	    {
 	        Dash();
             //State=AstronautState.Dashing;  //TODO relacher l'état Dashing
 	        return;
-
 	    }
-        else if (State >= AstronautState.Dashing)
-            return;
-        else if (State >= AstronautState.Ejecting)
-            return;
 
         if (!grounded) return;
 
@@ -278,7 +230,6 @@ public class Astronaut : MonoBehaviour {
 
 	public void Dash()
 	{
-	    
 	    if (Time.time < DashTime + lastDashTime)
             return;
         
diff --git a/Assets/Scripts/AstronautAnimator.cs b/Assets/Scripts/AstronautAnimator.cs
index cbcfd48..5259129 100644
--- a/Assets/Scripts/AstronautAnimator.cs
+++ b/Assets/Scripts/AstronautAnimator.cs
@@ -51,7 +51,6 @@ public class AstronautAnimator : MonoBehaviour {
 
     public void Walk(bool right)
     {
-        Debug.Log("Walking!");
         StartCoroutine(Rotate(right? -1 : 1));
     }
 
@@ -90,12 +89,8 @@ public class AstronautAnimator : MonoBehaviour {
 
         if (aspi.State == Astronaut.AstronautState.Walking)
         {
-            Debug.Log("Walking again");
             StartCoroutine(Rotate(-side));
         }
-        else
-            Debug.Log("Walking stop");
-        //yield return null;
     }