diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt
index 50ea21d..0bbcf06 100644
--- a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt
+++ b/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt
@@ -95,7 +95,7 @@ class ConfirmationActivity : ActivityBase() {
         for (trial in 0..1) {
             try {
                 StateKeeper.usbMassStorageDevice!!.init()
-                val blockDev = StateKeeper.usbMassStorageDevice?.blockDevice
+                val blockDev = StateKeeper.usbMassStorageDevice!!.blockDevice
 
                 if (blockDev != null) {
                     val devSize = (blockDev.size.toLong() * blockDev.blockSize.toLong())
@@ -178,7 +178,7 @@ class ConfirmationActivity : ActivityBase() {
         else
             startService(intent)
 
-        moveTaskToBack(true);
+        moveTaskToBack(true)
         finish()
     }
 
diff --git a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt
index d365f04..1f60bbd 100644
--- a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt
+++ b/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt
@@ -83,7 +83,7 @@ class StartActivity : ActivityBase() {
             FlashMethod.FLASH_API -> {
                 val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
                 intent.addCategory(Intent.CATEGORY_OPENABLE)
-                intent.setType("*/*");
+                intent.type = "*/*"
                 startActivityForResult(intent, READ_REQUEST_CODE)
             }
             FlashMethod.FLASH_DMG_API -> {
diff --git a/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt b/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt
index 0f2ef3f..ebc8d6f 100644
--- a/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt
+++ b/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt
@@ -1,3 +1,3 @@
 package eu.depau.etchdroid.enums
 
-enum class PartitionType {}
\ No newline at end of file
+enum class PartitionType
\ No newline at end of file
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt b/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt
index a135117..8b05be1 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/DoNotShowAgainDialogFragment.kt
@@ -16,12 +16,11 @@ class DoNotShowAgainDialogFragment(nightMode: Boolean) : DialogFragment() {
     var negativeButton: String? = null
     var message: String? = null
     var listener: DialogListener? = null
-    val dialogTheme: Int
+    val dialogTheme: Int = if (nightMode) R.style.DialogThemeDark else R.style.DialogThemeLight
 
     constructor() : this(false)
 
     init {
-        dialogTheme = if (nightMode) R.style.DialogThemeDark else R.style.DialogThemeLight
         setStyle(DialogFragment.STYLE_NORMAL, dialogTheme)
     }