diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
index d16e92ae5..d68cda6a7 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
@@ -196,12 +196,11 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
         val list = adapterData ?: return
         val dataToRemove = HashSet<ParcelableStatus>()
         for (element in list) {
-            val status = element
-            if (status.id == statusId || status.retweet_id == statusId) {
-                dataToRemove.add(status)
-            } else if (status.my_retweet_id == statusId) {
-                status.my_retweet_id = null
-                status.retweet_count = status.retweet_count - 1
+            if (element.id == statusId || element.retweet_id == statusId) {
+                dataToRemove.add(element)
+            } else if (element.my_retweet_id == statusId) {
+                element.my_retweet_id = null
+                element.retweet_count = element.retweet_count - 1
             }
         }
         if (list is MutableList) {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt
index c2399bcfe..2ed703e31 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt
@@ -167,7 +167,7 @@ class CacheProvider : ContentProvider() {
          * Copied from ContentResolver.java
          */
         private fun modeToMode(mode: String): Int {
-            val modeBits: Int = if ("r" == mode) {
+            return if ("r" == mode) {
                 ParcelFileDescriptor.MODE_READ_ONLY
             } else if ("w" == mode || "wt" == mode) {
                 ParcelFileDescriptor.MODE_WRITE_ONLY or ParcelFileDescriptor.MODE_CREATE or ParcelFileDescriptor.MODE_TRUNCATE
@@ -180,7 +180,6 @@ class CacheProvider : ContentProvider() {
             } else {
                 throw IllegalArgumentException("Invalid mode: $mode")
             }
-            return modeBits
         }
     }
 }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt
index 2a9179f84..e4f9f09fe 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt
@@ -58,7 +58,6 @@ import org.mariotaku.twidere.model.tab.extra.HomeTabExtras
 import org.mariotaku.twidere.model.tab.extra.InteractionsTabExtras
 import org.mariotaku.twidere.model.tab.extra.TabExtras
 import org.mariotaku.twidere.model.util.AccountUtils
-import org.mariotaku.twidere.provider.TwidereDataStore
 import org.mariotaku.twidere.provider.TwidereDataStore.*
 import org.mariotaku.twidere.provider.TwidereDataStore.Messages.Conversations
 import org.mariotaku.twidere.util.content.ContentResolverUtils
@@ -309,12 +308,11 @@ object DataStoreUtils {
     }
 
     fun getAccountDisplayName(context: Context, accountKey: UserKey, nameFirst: Boolean): String? {
-        val name: String? = if (nameFirst) {
+        return if (nameFirst) {
             getAccountName(context, accountKey)
         } else {
             "@${getAccountScreenName(context, accountKey)}"
         }
-        return name
     }
 
     fun getAccountName(context: Context, accountKey: UserKey): String? {