diff --git a/app/src/main/java/com/kernelmaft/zanbur/main.kt b/app/src/main/java/com/kernelmaft/zanbur/main.kt
index 769890f..6b65411 100644
--- a/app/src/main/java/com/kernelmaft/zanbur/main.kt
+++ b/app/src/main/java/com/kernelmaft/zanbur/main.kt
@@ -25,14 +25,10 @@ class MainActivity : EdgeToEdgeActivity () {
 
 		lifecycleScope . launch (IO) {
 			val prefs = dataStore . data . firstOrNull ()
-			if ( prefs != null ) {
-				val savedSceneName = prefs [ stringPreferencesKey ("scene") ]
-				if ( savedSceneName != null ) {
-					val savedScene = AppState . groups [0] . scenes . find { it . name == savedSceneName }
-					if ( savedScene != null ) {
-						AppState . setCurrentScene ( 0 , savedScene )
-					}
-				}
+			val savedSceneName = prefs ?. get ( stringPreferencesKey ("scene") )
+			if ( savedSceneName != null ) {
+				val savedScene = AppState . groups [0] . scenes . find { it . name == savedSceneName }
+				savedScene ?. let { AppState . setCurrentScene ( 0 , it ) }
 			}
 		}
 
@@ -40,9 +36,9 @@ class MainActivity : EdgeToEdgeActivity () {
 			AppFrame {
 				Column ( Modifier . width ( 300 . dp ) ) {
 					groups . forEach { group ->
-						SceneSwitcher (group) {
-							AppState . setCurrentScene ( group . id , it )
-							publishSceneChange ( group , it )
+						SceneSwitcher (group) { newScene ->
+							AppState . setCurrentScene ( group . id , newScene )
+							publishSceneChange ( group , newScene )
 						}
 					}
 				}