Re-factored player_controller a bit