diff --git a/2d/hdr/beach_cave.gd b/2d/hdr/beach_cave.gd
index ddb31320..e56d3ed9 100644
--- a/2d/hdr/beach_cave.gd
+++ b/2d/hdr/beach_cave.gd
@@ -1,17 +1,16 @@
-
 extends Node2D
 
-# Member variables
 const CAVE_LIMIT = 1000
 
+onready var cave = $Cave
 
 func _input(event):
-	if event is InputEventMouseMotion and event.button_mask&1:
+	if event is InputEventMouseMotion and event.button_mask > 0:
 		var rel_x = event.relative.x
-		var cavepos = $cave.position
+		var cavepos = cave.position
 		cavepos.x += rel_x
 		if cavepos.x < -CAVE_LIMIT:
 			cavepos.x = -CAVE_LIMIT
 		elif cavepos.x > 0:
 			cavepos.x = 0
-		$cave.position = cavepos
+		cave.position = cavepos
diff --git a/2d/hdr/beach_cave.tscn b/2d/hdr/beach_cave.tscn
index b1d2c0f3..5095987f 100644
--- a/2d/hdr/beach_cave.tscn
+++ b/2d/hdr/beach_cave.tscn
@@ -19,10 +19,10 @@ glow_strength = 0.88
 glow_blend_mode = 0
 glow_bicubic_upscale = true
 
-[node name="hdr" type="Node2D"]
+[node name="BeachCave" type="Node2D"]
 script = ExtResource( 1 )
 
-[node name="beach" type="Sprite" parent="."]
+[node name="Beach" type="Sprite" parent="."]
 modulate = Color( 2, 2, 2, 1 )
 self_modulate = Color( 2, 2, 2, 1 )
 texture = ExtResource( 2 )
@@ -30,13 +30,13 @@ centered = false
 region_enabled = true
 region_rect = Rect2( 0, 0, 3840, 720 )
 
-[node name="cave" type="Sprite" parent="."]
+[node name="Cave" type="Sprite" parent="."]
 self_modulate = Color( 0.233166, 0.221219, 0.23582, 1 )
 scale = Vector2( 1.2, 1 )
 texture = ExtResource( 3 )
 centered = false
 
-[node name="environment" type="WorldEnvironment" parent="."]
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 1 )
 
 [node name="Camera2D" type="Camera2D" parent="."]