diff --git a/src/dev_tools/ui/maze_controls.rs b/src/dev_tools/ui/maze_controls.rs
index 66e4668..5767ca9 100644
--- a/src/dev_tools/ui/maze_controls.rs
+++ b/src/dev_tools/ui/maze_controls.rs
@@ -1,7 +1,7 @@
 use crate::{
     floor::components::{CurrentFloor, Floor},
     maze::{components::MazeConfig, events::MazeEvent, GlobalMazeConfig, MazePluginLoaded},
-    player::events::RespawnPlayer,
+    player::events::PlayerEvent,
 };
 use bevy::{prelude::*, window::PrimaryWindow};
 use bevy_egui::{
@@ -65,8 +65,8 @@ pub(crate) fn maze_controls_ui(world: &mut World) {
                         config: maze_config,
                     });
                 }
-                if let Some(mut event_writer) = world.get_resource_mut::<Events<RespawnPlayer>>() {
-                    event_writer.send(RespawnPlayer);
+                if let Some(mut event_writer) = world.get_resource_mut::<Events<PlayerEvent>>() {
+                    event_writer.send(PlayerEvent::Respawn);
                 }
             }
         }
diff --git a/src/maze/mod.rs b/src/maze/mod.rs
index 189faf3..3731cb3 100644
--- a/src/maze/mod.rs
+++ b/src/maze/mod.rs
@@ -18,6 +18,6 @@ pub(super) fn plugin(app: &mut App) {
 }
 
 pub fn spawn_level_command(world: &mut World) {
-    world.insert_resource(MazePluginLoaded);
     let _ = world.run_system_once(systems::setup::setup);
+    world.insert_resource(MazePluginLoaded);
 }
diff --git a/src/maze/systems/common.rs b/src/maze/systems/common.rs
index 2ca0add..457f0e0 100644
--- a/src/maze/systems/common.rs
+++ b/src/maze/systems/common.rs
@@ -5,10 +5,10 @@ use crate::maze::{
 use hexlab::{GeneratorType, HexMaze, MazeBuilder};
 
 pub(super) fn generate_maze(config: &MazeConfig) -> MazeResult<HexMaze> {
-    Ok(MazeBuilder::new()
+    MazeBuilder::new()
         .with_radius(config.radius)
         .with_seed(config.seed)
         .with_generator(GeneratorType::RecursiveBacktracking)
         .build()
-        .map_err(|_| MazeError::generation_failed(config.radius, config.seed))?)
+        .map_err(|_| MazeError::generation_failed(config.radius, config.seed))
 }
diff --git a/src/maze/systems/spawn.rs b/src/maze/systems/spawn.rs
index 33956d2..a69c69d 100644
--- a/src/maze/systems/spawn.rs
+++ b/src/maze/systems/spawn.rs
@@ -49,7 +49,7 @@ pub(super) fn spawn_maze_tiles(
 ) {
     commands.entity(parent_entity).with_children(|parent| {
         for tile in maze.values() {
-            spawn_single_hex_tile(parent, &assets, tile, maze_config, global_config);
+            spawn_single_hex_tile(parent, assets, tile, maze_config, global_config);
         }
     });
 }
diff --git a/src/maze/systems/update.rs b/src/maze/systems/update.rs
index 10c67eb..415887a 100644
--- a/src/maze/systems/update.rs
+++ b/src/maze/systems/update.rs
@@ -1,7 +1,4 @@
-use super::{
-    common::generate_maze,
-    spawn::{spawn_maze_tiles, spawn_single_hex_tile},
-};
+use super::{common::generate_maze, spawn::spawn_maze_tiles};
 use crate::{
     floor::components::Floor,
     maze::{
diff --git a/src/player/events.rs b/src/player/events.rs
index edd056e..7bcda24 100644
--- a/src/player/events.rs
+++ b/src/player/events.rs
@@ -1,4 +1,8 @@
 use bevy::prelude::*;
 
 #[derive(Debug, Event)]
-pub(crate) struct RespawnPlayer;
+pub enum PlayerEvent {
+    Spawn,
+    Respawn,
+    Despawn,
+}
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 5db0cf0..53d6129 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -5,11 +5,11 @@ mod systems;
 
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
 use components::Player;
-use events::RespawnPlayer;
+use events::PlayerEvent;
 
 pub(super) fn plugin(app: &mut App) {
     app.register_type::<Player>()
-        .add_event::<RespawnPlayer>()
+        .add_event::<PlayerEvent>()
         .add_plugins(systems::plugin);
 }
 
diff --git a/src/player/systems/despawn.rs b/src/player/systems/despawn.rs
index 24dc9f4..f1ad992 100644
--- a/src/player/systems/despawn.rs
+++ b/src/player/systems/despawn.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 
 use crate::player::components::Player;
 
-pub(crate) fn despawn_players(commands: &mut Commands, query: &Query<Entity, With<Player>>) {
+pub(super) fn despawn_players(commands: &mut Commands, query: &Query<Entity, With<Player>>) {
     for entity in query.iter() {
         commands.entity(entity).despawn_recursive();
     }
diff --git a/src/player/systems/event_handler.rs b/src/player/systems/event_handler.rs
new file mode 100644
index 0000000..cc7de49
--- /dev/null
+++ b/src/player/systems/event_handler.rs
@@ -0,0 +1,53 @@
+use crate::{
+    floor::components::CurrentFloor,
+    maze::{components::MazeConfig, GlobalMazeConfig},
+    player::{components::Player, events::PlayerEvent},
+};
+use bevy::prelude::*;
+
+use super::{despawn::despawn_players, respawn::respawn_player, spawn::spawn_player};
+
+pub(crate) fn handle_player_events(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    mut event_reader: EventReader<PlayerEvent>,
+    maze_config_query: Query<&MazeConfig, With<CurrentFloor>>,
+    player_query: Query<Entity, With<Player>>,
+    global_config: Res<GlobalMazeConfig>,
+) {
+    for event in event_reader.read() {
+        match event {
+            PlayerEvent::Spawn => {
+                let Ok(maze_config) = maze_config_query.get_single() else {
+                    warn!(
+                        "Failed to get maze configuration for current floor - cannot spawn player"
+                    );
+                    return;
+                };
+                spawn_player(
+                    &mut commands,
+                    &mut meshes,
+                    &mut materials,
+                    maze_config,
+                    &global_config,
+                );
+            }
+            PlayerEvent::Respawn => {
+                let Ok(maze_config) = maze_config_query.get_single() else {
+                    warn!("Failed to get maze configuration for current floor - cannot respawn player");
+                    return;
+                };
+                respawn_player(
+                    &mut commands,
+                    &mut meshes,
+                    &mut materials,
+                    &player_query,
+                    maze_config,
+                    &global_config,
+                );
+            }
+            PlayerEvent::Despawn => despawn_players(&mut commands, &player_query),
+        }
+    }
+}
diff --git a/src/player/systems/input.rs b/src/player/systems/input.rs
index a2ceac6..f536e76 100644
--- a/src/player/systems/input.rs
+++ b/src/player/systems/input.rs
@@ -24,7 +24,7 @@ pub(super) fn player_input(
             continue;
         };
 
-        let Some(tile) = maze.0.get_tile(&current_pos) else {
+        let Some(tile) = maze.0.get_tile(current_pos) else {
             continue;
         };
 
diff --git a/src/player/systems/mod.rs b/src/player/systems/mod.rs
index 0d8b002..aeb03be 100644
--- a/src/player/systems/mod.rs
+++ b/src/player/systems/mod.rs
@@ -1,16 +1,15 @@
-pub mod despawn;
+mod despawn;
+mod event_handler;
 mod input;
 mod movement;
-pub mod respawn;
+mod respawn;
 pub mod setup;
-pub mod spawn;
+mod spawn;
 
 use bevy::prelude::*;
+use event_handler::handle_player_events;
 use input::player_input;
 use movement::player_movement;
-use respawn::respawn_player;
-
-use crate::maze::MazePluginLoaded;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(
@@ -18,8 +17,7 @@ pub(super) fn plugin(app: &mut App) {
         (
             player_input,
             player_movement.after(player_input),
-            respawn_player,
-        )
-            .run_if(resource_exists::<MazePluginLoaded>),
+            handle_player_events,
+        ),
     );
 }
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
index c079b8e..6815064 100644
--- a/src/player/systems/movement.rs
+++ b/src/player/systems/movement.rs
@@ -20,14 +20,14 @@ pub(super) fn player_movement(
     maze_config_query: Query<&MazeConfig, With<CurrentFloor>>,
 ) {
     let Ok(maze_config) = maze_config_query.get_single() else {
-        error!("Failed to get maze configuration for current floor - cannot move player");
+        warn!("Failed to get maze configuration for current floor - cannot move player");
         return;
     };
 
     for (mut target, speed, mut current_hex, mut transform) in query.iter_mut() {
         if let Some(target_hex) = target.0 {
             let current_pos = transform.translation;
-            let target_pos = calculate_target_position(&maze_config, target_hex, current_pos.y);
+            let target_pos = calculate_target_position(maze_config, target_hex, current_pos.y);
 
             if should_complete_movement(current_pos, target_pos) {
                 transform.translation = target_pos;
diff --git a/src/player/systems/respawn.rs b/src/player/systems/respawn.rs
index 9918aaa..002eca5 100644
--- a/src/player/systems/respawn.rs
+++ b/src/player/systems/respawn.rs
@@ -1,33 +1,18 @@
+use super::{despawn::despawn_players, spawn::spawn_player};
 use crate::{
-    floor::components::CurrentFloor,
     maze::{components::MazeConfig, GlobalMazeConfig},
-    player::{components::Player, events::RespawnPlayer},
+    player::components::Player,
 };
 use bevy::prelude::*;
 
-use super::{despawn::despawn_players, spawn::spawn_player};
-
-pub(crate) fn respawn_player(
-    mut commands: Commands,
-    query: Query<Entity, With<Player>>,
-    maze_config_query: Query<&MazeConfig, With<CurrentFloor>>,
-    mut event_reader: EventReader<RespawnPlayer>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    global_config: Res<GlobalMazeConfig>,
+pub(super) fn respawn_player(
+    commands: &mut Commands,
+    meshes: &mut ResMut<Assets<Mesh>>,
+    materials: &mut ResMut<Assets<StandardMaterial>>,
+    query: &Query<Entity, With<Player>>,
+    maze_config: &MazeConfig,
+    global_config: &GlobalMazeConfig,
 ) {
-    let Ok(maze_config) = maze_config_query.get_single() else {
-        error!("Failed to get maze configuration for current floor - cannot respawn player");
-        return;
-    };
-    for _ in event_reader.read() {
-        despawn_players(&mut commands, &query);
-        spawn_player(
-            &mut commands,
-            &mut meshes,
-            &mut materials,
-            &maze_config,
-            &global_config,
-        );
-    }
+    despawn_players(commands, query);
+    spawn_player(commands, meshes, materials, maze_config, global_config);
 }
diff --git a/src/player/systems/setup.rs b/src/player/systems/setup.rs
index 3b8c96f..94287fa 100644
--- a/src/player/systems/setup.rs
+++ b/src/player/systems/setup.rs
@@ -1,29 +1,6 @@
+use crate::player::events::PlayerEvent;
 use bevy::prelude::*;
 
-use crate::{
-    floor::components::CurrentFloor,
-    maze::{components::MazeConfig, GlobalMazeConfig},
-};
-
-use super::spawn::spawn_player;
-
-pub(crate) fn setup(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    maze_config_query: Query<&MazeConfig, With<CurrentFloor>>,
-    global_config: Res<GlobalMazeConfig>,
-) {
-    let Ok(maze_config) = maze_config_query.get_single() else {
-        error!("Failed to get maze configuration for current floor - cannot spawn player");
-        return;
-    };
-
-    spawn_player(
-        &mut commands,
-        &mut meshes,
-        &mut materials,
-        &maze_config,
-        &global_config,
-    );
+pub(crate) fn setup(mut event_writer: EventWriter<PlayerEvent>) {
+    event_writer.send(PlayerEvent::Spawn);
 }