diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenAdjustmentUtil.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenAdjustmentUtil.kt
index 7a6a1befb..3d73cce7f 100644
--- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenAdjustmentUtil.kt
+++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenAdjustmentUtil.kt
@@ -27,8 +27,8 @@ class ScreenAdjustmentUtil(private val windowManager: WindowManager,
 
     fun cycleLayouts() {
         // TODO: figure out how to pull these from R.array
-        val landscape_values = intArrayOf(6,1,3,4,0,5);
-        val portrait_values = intArrayOf(0,1);
+        val landscape_values = intArrayOf(6,1,3,4,0,5)
+        val portrait_values = intArrayOf(0,1)
         if (NativeLibrary.isPortraitMode) {
             val current_layout = IntSetting.PORTRAIT_SCREEN_LAYOUT.int
             val pos = portrait_values.indexOf(current_layout)
diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenLayout.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenLayout.kt
index 54a8ca28a..09c8e1ff4 100644
--- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenLayout.kt
+++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/display/ScreenLayout.kt
@@ -28,7 +28,7 @@ enum class PortraitScreenLayout(val int: Int) {
 
     companion object {
         fun from(int: Int): PortraitScreenLayout {
-            return entries.firstOrNull { it.int == int } ?: TOP_FULL_WIDTH;
+            return entries.firstOrNull { it.int == int } ?: TOP_FULL_WIDTH
         }
     }
 }
diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsAdapter.kt
index 78840e6f2..644f532aa 100644
--- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsAdapter.kt
+++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsAdapter.kt
@@ -274,12 +274,12 @@ class SettingsAdapter(
             value = sliderProgress.toFloat()
             textSliderValue!!.addTextChangedListener( object : TextWatcher {
                     override fun afterTextChanged(s: Editable) {
-                        val textValue = s.toString().toIntOrNull();
+                        val textValue = s.toString().toIntOrNull()
                         if (textValue == null || textValue < valueFrom || textValue > valueTo) {
                             textInputLayout!!.error = "Inappropriate value"
                         } else {
                             textInputLayout!!.error = null
-                            value = textValue.toFloat();
+                            value = textValue.toFloat()
                         }
                     }
                     override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsFragmentPresenter.kt
index 969d65ed0..65b89cdfc 100644
--- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/features/settings/ui/SettingsFragmentPresenter.kt
@@ -110,7 +110,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
 
     /** Returns the portrait mode width */
     private fun getWidth(): Int {
-        val dm = Resources.getSystem().displayMetrics;
+        val dm = Resources.getSystem().displayMetrics
         return if (dm.widthPixels < dm.heightPixels)
             dm.widthPixels
         else
@@ -118,7 +118,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
     }
 
     private fun getHeight(): Int {
-        val dm = Resources.getSystem().displayMetrics;
+        val dm = Resources.getSystem().displayMetrics
         return if (dm.widthPixels < dm.heightPixels)
             dm.heightPixels
         else
diff --git a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/GameIconUtils.kt b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/GameIconUtils.kt
index 320c3af2d..9f76e3b37 100644
--- a/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/GameIconUtils.kt
+++ b/src/android/app/src/main/java/io/github/mandarine3ds/mandarine/utils/GameIconUtils.kt
@@ -28,7 +28,7 @@ class GameIconFetcher(
 ) : Fetcher {
     override suspend fun fetch(): FetchResult {
         return DrawableResult(
-            drawable = getGameIcon(game.icon)!!.toDrawable(options.context.resources),
+            drawable = getGameIcon(game.icon).toDrawable(options.context.resources),
             isSampled = false,
             dataSource = DataSource.DISK
         )