diff --git a/app/src/main/java/me/zhanghai/android/files/compat/InputStreamCompat.kt b/app/src/main/java/me/zhanghai/android/files/compat/InputStreamCompat.kt
index 8246474c8..445e9187b 100644
--- a/app/src/main/java/me/zhanghai/android/files/compat/InputStreamCompat.kt
+++ b/app/src/main/java/me/zhanghai/android/files/compat/InputStreamCompat.kt
@@ -15,7 +15,7 @@ fun KClass<InputStream>.nullInputStream(): InputStream =
 
         override fun read(): Int {
             ensureOpen()
-            return -1;
+            return -1
         }
 
         override fun read(bytes: ByteArray, offset: Int, length: Int): Int {
diff --git a/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt b/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt
index 67498ff24..4213b2374 100644
--- a/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt
+++ b/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt
@@ -3,7 +3,7 @@
  * All Rights Reserved.
  */
 
-package me.zhanghai.android.files.filejob;
+package me.zhanghai.android.files.filejob
 
 import android.app.PendingIntent
 import android.content.Intent
diff --git a/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt b/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
index 73f40d134..5c02a1c79 100644
--- a/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
+++ b/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
@@ -255,7 +255,7 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
                 R.id.action_create_directory -> showCreateDirectoryDialog()
             }
             // Returning false causes the speed dial to close without animation.
-            //return false;
+            //return false
             binding.speedDialView.close()
             true
         }
diff --git a/app/src/main/java/me/zhanghai/android/files/navigation/NavigationFragment.kt b/app/src/main/java/me/zhanghai/android/files/navigation/NavigationFragment.kt
index beddeb474..897189d23 100644
--- a/app/src/main/java/me/zhanghai/android/files/navigation/NavigationFragment.kt
+++ b/app/src/main/java/me/zhanghai/android/files/navigation/NavigationFragment.kt
@@ -38,7 +38,7 @@ class NavigationFragment : Fragment(), NavigationItem.Listener {
 
         binding.recyclerView.setHasFixedSize(true)
         // TODO: Needed?
-        //binding.recyclerView.setItemAnimator(new NoChangeAnimationItemAnimator());
+        //binding.recyclerView.setItemAnimator(new NoChangeAnimationItemAnimator())
         val context = requireContext()
         binding.recyclerView.layoutManager = LinearLayoutManager(context)
         adapter = NavigationListAdapter(this, context)
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/common/ByteBufferInputStream.kt b/app/src/main/java/me/zhanghai/android/files/provider/common/ByteBufferInputStream.kt
index 3899adb05..5fe347463 100644
--- a/app/src/main/java/me/zhanghai/android/files/provider/common/ByteBufferInputStream.kt
+++ b/app/src/main/java/me/zhanghai/android/files/provider/common/ByteBufferInputStream.kt
@@ -62,5 +62,5 @@ class ByteBufferInputStream(buffer: ByteBuffer) : InputStream() {
         buffer = null
     }
 
-    private fun ensureOpen(): ByteBuffer = buffer ?: throw IOException("Stream closed");
+    private fun ensureOpen(): ByteBuffer = buffer ?: throw IOException("Stream closed")
 }
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/ftp/client/Mode.kt b/app/src/main/java/me/zhanghai/android/files/provider/ftp/client/Mode.kt
index 96d771890..95e9156f7 100644
--- a/app/src/main/java/me/zhanghai/android/files/provider/ftp/client/Mode.kt
+++ b/app/src/main/java/me/zhanghai/android/files/provider/ftp/client/Mode.kt
@@ -7,5 +7,5 @@ package me.zhanghai.android.files.provider.ftp.client
 
 enum class Mode {
     ACTIVE,
-    PASSIVE;
+    PASSIVE
 }
diff --git a/app/src/main/java/me/zhanghai/android/files/theme/custom/ThemeColor.kt b/app/src/main/java/me/zhanghai/android/files/theme/custom/ThemeColor.kt
index fb9727903..410cd098d 100644
--- a/app/src/main/java/me/zhanghai/android/files/theme/custom/ThemeColor.kt
+++ b/app/src/main/java/me/zhanghai/android/files/theme/custom/ThemeColor.kt
@@ -23,5 +23,5 @@ enum class ThemeColor(@ColorRes val resourceId: Int) {
     MATERIAL_DEEP_ORANGE(R.color.material_deep_orange),
     MATERIAL_BROWN(R.color.material_brown),
     MATERIAL_GREY(R.color.material_grey),
-    MATERIAL_BLUE_GREY(R.color.material_blue_grey);
+    MATERIAL_BLUE_GREY(R.color.material_blue_grey)
 }
diff --git a/app/src/main/java/me/zhanghai/android/files/theme/night/NightMode.kt b/app/src/main/java/me/zhanghai/android/files/theme/night/NightMode.kt
index b7260cd6a..4194ae4c6 100644
--- a/app/src/main/java/me/zhanghai/android/files/theme/night/NightMode.kt
+++ b/app/src/main/java/me/zhanghai/android/files/theme/night/NightMode.kt
@@ -12,5 +12,5 @@ enum class NightMode(val value: Int) {
     OFF(AppCompatDelegate.MODE_NIGHT_NO),
     ON(AppCompatDelegate.MODE_NIGHT_YES),
     AUTO_TIME(AppCompatDelegate.MODE_NIGHT_AUTO_TIME),
-    AUTO_BATTERY(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
+    AUTO_BATTERY(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY)
 }
diff --git a/app/src/main/java/me/zhanghai/android/files/util/ClickableArrowKeyMovementMethod.kt b/app/src/main/java/me/zhanghai/android/files/util/ClickableArrowKeyMovementMethod.kt
index be0dfc794..6cd476eca 100644
--- a/app/src/main/java/me/zhanghai/android/files/util/ClickableArrowKeyMovementMethod.kt
+++ b/app/src/main/java/me/zhanghai/android/files/util/ClickableArrowKeyMovementMethod.kt
@@ -196,7 +196,7 @@ object ClickableArrowKeyMovementMethod : ArrowKeyMovementMethod() {
                 }
                 // Removed
                 //else {
-                //    Selection.removeSelection(text);
+                //    Selection.removeSelection(text)
                 //}
             }
         }