SceneManager + code cleanup