diff --git a/assets/shared/images/ui skins/default/arrows/caution.png b/assets/shared/images/ui skins/default/arrows/caution.png
index 4fdbbe8398..81f4973b5d 100644
Binary files a/assets/shared/images/ui skins/default/arrows/caution.png and b/assets/shared/images/ui skins/default/arrows/caution.png differ
diff --git a/assets/shared/images/ui skins/default/arrows/death.png b/assets/shared/images/ui skins/default/arrows/death.png
index a1ed355a3d..b19591152a 100644
Binary files a/assets/shared/images/ui skins/default/arrows/death.png and b/assets/shared/images/ui skins/default/arrows/death.png differ
diff --git a/assets/shared/images/ui skins/default/arrows/default.png b/assets/shared/images/ui skins/default/arrows/default.png
index 78b0a50120..309325bf0e 100644
Binary files a/assets/shared/images/ui skins/default/arrows/default.png and b/assets/shared/images/ui skins/default/arrows/default.png differ
diff --git a/assets/shared/images/ui skins/default/arrows/hurt.png b/assets/shared/images/ui skins/default/arrows/hurt.png
index 3d46724c6b..c21c63a963 100644
Binary files a/assets/shared/images/ui skins/default/arrows/hurt.png and b/assets/shared/images/ui skins/default/arrows/hurt.png differ
diff --git a/source/game/Note.hx b/source/game/Note.hx
index 98ebc0642a..69e7ae8bed 100644
--- a/source/game/Note.hx
+++ b/source/game/Note.hx
@@ -234,7 +234,6 @@ class Note extends FlxSkewedSprite {
 				if (prevNote.animation != null)
 					prevNote.animation.play("hold");
 
-
 				prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * speed;
 				prevNote.updateHitbox();
 				prevNote.sustainScaleY = prevNote.scale.y;
@@ -290,39 +289,31 @@ class Note extends FlxSkewedSprite {
 	}
 
 	public function calculateCanBeHit() {
-		if (this != null) {
-			if (mustPress) {
-				/**
-					// TODO: make this shit use something from the arrow config .txt file
-				**/
-				if (shouldHit) {
-					if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
-						&& strumTime < Conductor.songPosition + Conductor.safeZoneOffset)
-						canBeHit = true;
-					else
-						canBeHit = false;
-				} else {
-					if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset * 0.3
-						&& strumTime < Conductor.songPosition + Conductor.safeZoneOffset * 0.2)
-						canBeHit = true;
-					else
-						canBeHit = false;
-				}
-
-				if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit)
-					tooLate = true;
+		if (this == null) {
+			return;
+		}
+		if (mustPress) {
+			/**
+				// TODO: make this shit use something from the arrow config .txt file
+			**/
+			if (shouldHit) {
+				canBeHit = (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
+					&& strumTime < Conductor.songPosition + Conductor.safeZoneOffset);
 			} else {
-				canBeHit = false;
+				canBeHit = (strumTime > Conductor.songPosition - Conductor.safeZoneOffset / 3
+					&& strumTime < Conductor.songPosition + Conductor.safeZoneOffset * 0.2);
+			}
 
-				if (!isSustainNote) {
-					if (strumTime <= Conductor.songPosition)
-						canBeHit = true;
-				} else {
-					if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset * 0.3)
-						canBeHit = true;
-					else
-						canBeHit = false;
-				}
+			if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit)
+				tooLate = true;
+		} else {
+			canBeHit = false;
+
+			if (!isSustainNote) {
+				if (strumTime <= Conductor.songPosition)
+					canBeHit = true;
+			} else {
+				canBeHit = (strumTime < Conductor.songPosition - Conductor.safeZoneOffset / 3);
 			}
 		}
 	}
@@ -339,10 +330,10 @@ class Note extends FlxSkewedSprite {
 	}
 
 	@:noCompletion function set_speed(speed:Float):Float {
-		if(Options.getData("useCustomScrollSpeed")){
+		if (Options.getData("useCustomScrollSpeed")) {
 			speed = Options.getData("customScrollSpeed") / PlayState.songMultiplier;
 		}
-		if(isSustainNote && !inEditor && animation != null && !animation?.curAnim?.name?.endsWith('end')){
+		if (isSustainNote && !inEditor && animation != null && !animation?.curAnim?.name?.endsWith('end')) {
 			scale.y = Std.parseFloat(PlayState.instance.ui_settings[0]) * (Std.parseFloat(PlayState.instance.ui_settings[2])
 				- (Std.parseFloat(PlayState.instance.mania_size[3])));
 			scale.y *= Conductor.stepCrochet / 100 * 1.5 * speed;
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
index 4ed568560d..184b81869a 100644
--- a/source/states/PlayState.hx
+++ b/source/states/PlayState.hx
@@ -1676,7 +1676,7 @@ class PlayState extends MusicBeatState {
 				for (susNote in 0...Math.floor(swagNote.sustainLength / Std.int(Conductor.stepCrochet))) {
 					oldNote = unspawnNotes[unspawnNotes.length - 1];
 
-					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + (Conductor.stepCrochet / (Options.getData("downscroll") ? 1 :FlxMath.roundDecimal(speed,
+					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + (Conductor.stepCrochet / (Options.getData("downscroll") ? 1 : FlxMath.roundDecimal(speed,
 					2))), noteData, oldNote, true,
 					char, songNotes[4], null, chars, gottaHitNote);
 					sustainNote.scrollFactor.set();