diff --git a/source/Note.hx b/source/Note.hx
index e3f20d53..f8be255b 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -228,6 +228,7 @@ class Note extends FlxSprite
 			parentNote.childrenNotes.push(this);
 		} else if (!isSustainNote)
 			parentNote = null;
+		moves = false;
 
 	}
 
@@ -352,21 +353,15 @@ class Note extends FlxSprite
 		if (mustPress)
 		{
 			// ok river
-			if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
-				&& strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * earlyHitMult))
-				canBeHit = true;
-			else
-				canBeHit = false;
-
-			if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit)
-				tooLate = true;
+			canBeHit = (strumTime > Conductor.songPosition - Conductor.safeZoneOffset && strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * earlyHitMult));
+
+			tooLate = (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit);
 		}
 		else
 		{
 			canBeHit = false;
 
-			if (strumTime <= Conductor.songPosition)
-				wasGoodHit = true;
+			wasGoodHit = (strumTime <= Conductor.songPosition);
 		}
 
 		if (tooLate || (parentNote != null && parentNote.tooLate))