diff --git a/vegeconda/door.gd b/vegeconda/door.gd
index b3c69e3..fc96920 100644
--- a/vegeconda/door.gd
+++ b/vegeconda/door.gd
@@ -62,15 +62,16 @@ func close():
 
 
 func _on_animated_sprite_2d_animation_finished() -> void:
-    if door_state == DoorState.CLOSING:
-        door_state = DoorState.CLOSED
-        $CollisionShape2D.disabled = false
-        play_animation()
-    elif door_state == DoorState.OPENING:
-        door_state = DoorState.OPENED
-        $CollisionShape2D.disabled = true
-        play_animation()
-    elif door_state == DoorState.CLOSED:
-        closed.emit()
-    elif door_state == DoorState.OPENED:
-        opened.emit()
+    match door_state:
+        DoorState.CLOSING:
+            door_state = DoorState.CLOSED
+            $CollisionShape2D.disabled = false
+            play_animation()
+        DoorState.OPENING:
+            door_state = DoorState.OPENED
+            $CollisionShape2D.disabled = true
+            play_animation()
+        DoorState.CLOSED:
+            closed.emit()
+        DoorState.OPENED:
+            opened.emit()
diff --git a/vegeconda/pickup.gd b/vegeconda/pickup.gd
index 9085942..3254338 100644
--- a/vegeconda/pickup.gd
+++ b/vegeconda/pickup.gd
@@ -50,12 +50,13 @@ func play_animation() -> void:
 
 
 func _on_animated_sprite_2d_animation_finished() -> void:
-    if pickup_state == PickupState.PREPARING:
-        pickup_state = PickupState.SHOWING_UP
-        play_animation()
-    elif pickup_state == PickupState.SHOWING_UP:
-        pickup_state = PickupState.IDLING
-        play_animation()
-    elif pickup_state == PickupState.HIGHLIGHTING:
-        pickup_state = PickupState.IDLING
-        play_animation()
+    match pickup_state:
+        PickupState.PREPARING:
+            pickup_state = PickupState.SHOWING_UP
+            play_animation()
+        PickupState.SHOWING_UP:
+            pickup_state = PickupState.IDLING
+            play_animation()
+        PickupState.HIGHLIGHTING:
+            pickup_state = PickupState.IDLING
+            play_animation()