diff --git a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt
index 81d8896..e4ca38f 100644
--- a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt
@@ -36,21 +36,17 @@ abstract class BaseActivity : AppCompatActivity(),
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        if (key == "language") {
-            setLanguage(sharedPreferences.getString("language", null))
-        }
-        if (key == "screen_on") {
-            keepScreenOn(sharedPreferences.getBoolean("screen_on", false))
-        }
-        if (key == "theme") {
-            updateTheme(sharedPreferences.getString("theme", null))
+        when(key) {
+            "language" -> setLanguage(sharedPreferences.getString(key, null))
+            "screen_on" -> keepScreenOn(sharedPreferences.getBoolean(key, false))
+            "theme" -> updateTheme(sharedPreferences.getString(key, null))
         }
     }
 
 
     private fun updateTheme(theme: String?) {
 
-        var themeValue = when (theme) {
+        val themeValue = when (theme) {
             "light" -> AppCompatDelegate.MODE_NIGHT_NO
             "dark" -> AppCompatDelegate.MODE_NIGHT_YES
             "default" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM