Refactored a bit SceneTree