diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/BadFormatException.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/BadFormatException.kt
index d3e2d4f18..1c8263180 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/BadFormatException.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/BadFormatException.kt
@@ -4,6 +4,6 @@ package org.dslul.openboard.inputmethod.dictionarypack
  * Exception thrown when the metadata for the dictionary does not comply to a known format.
  */
 class BadFormatException : Exception {
-    constructor() : super() {}
-    constructor(message: String?) : super(message) {}
+    constructor() : super()
+    constructor(message: String?) : super(message)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/ButtonSwitcher.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/ButtonSwitcher.kt
index 60b3c32e4..b819dd937 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/ButtonSwitcher.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/ButtonSwitcher.kt
@@ -23,8 +23,8 @@ class ButtonSwitcher : FrameLayout {
     private var mInterfaceState: DictionaryListInterfaceState? = null
     private var mOnClickListener: OnClickListener? = null
 
-    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) {}
-    constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context!!, attrs, defStyle) {}
+    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs)
+    constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context!!, attrs, defStyle)
 
     fun reset(interfaceState: DictionaryListInterfaceState?) {
         mStatus = NOT_INITIALIZED
@@ -77,9 +77,9 @@ class ButtonSwitcher : FrameLayout {
         if (null == mInstallButton) return
         val width = width
         // Set to out of the screen if that's not the currently displayed status
-        mInstallButton!!.setTranslationX(if (STATUS_INSTALL == status) 0F else width.toFloat())
-        mCancelButton!!.setTranslationX(if (STATUS_CANCEL == status) 0F else width.toFloat())
-        mDeleteButton!!.setTranslationX(if (STATUS_DELETE == status) 0F else width.toFloat())
+        mInstallButton!!.translationX = if (STATUS_INSTALL == status) 0F else width.toFloat()
+        mCancelButton!!.translationX = if (STATUS_CANCEL == status) 0F else width.toFloat()
+        mDeleteButton!!.translationX = if (STATUS_DELETE == status) 0F else width.toFloat()
     }
 
     // The helper method for {@link AnimatorListenerAdapter}.
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryProvider.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryProvider.kt
index 74a9c34f8..b19e5b6d7 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryProvider.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryProvider.kt
@@ -302,7 +302,6 @@ class DictionaryProvider : ContentProvider() {
         val context = context
         val results: Cursor = MetadataDbHelper.Companion.queryInstalledOrDeletingOrAvailableDictionaryMetadata(context,
                 clientId)
-                ?: return emptyList()
         return try {
             val dicts = HashMap<String, WordListInfo>()
             val idIndex = results.getColumnIndex(MetadataDbHelper.Companion.WORDLISTID_COLUMN)
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsActivity.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsActivity.kt
index ee5e7a166..1f9ae88a5 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsActivity.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsActivity.kt
@@ -3,7 +3,6 @@ package org.dslul.openboard.inputmethod.dictionarypack
 import android.annotation.TargetApi
 import android.content.Intent
 import android.os.Build
-import android.os.Bundle
 import android.preference.PreferenceActivity
 import org.dslul.openboard.inputmethod.latin.utils.FragmentUtils
 
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataDbHelper.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataDbHelper.kt
index 9e3b526ca..ec211c2cc 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataDbHelper.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataDbHelper.kt
@@ -324,7 +324,7 @@ class MetadataDbHelper private constructor(private val mContext: Context?, priva
             val values = ContentValues()
             values.put(CLIENT_LAST_UPDATE_DATE_COLUMN, System.currentTimeMillis())
             val defaultDb = getDb(context, null)
-            val cursor = queryClientIds(context) ?: return
+            val cursor = queryClientIds(context)
             try {
                 if (!cursor.moveToFirst()) return
                 do {
@@ -679,10 +679,8 @@ class MetadataDbHelper private constructor(private val mContext: Context?, priva
             db.execSQL(METADATA_TABLE_CREATE)
             // Remove this client's entry in the clients table
             val defaultDb = getDb(context, "")
-            return if (0 == defaultDb.delete(CLIENT_TABLE_NAME,
-                            "$CLIENT_CLIENT_ID_COLUMN = ?", arrayOf(clientId))) {
-                false
-            } else true
+            return 0 != defaultDb.delete(CLIENT_TABLE_NAME,
+                    "$CLIENT_CLIENT_ID_COLUMN = ?", arrayOf(clientId))
         }
 
         /**
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataHandler.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataHandler.kt
index c156148f4..d12ba7c53 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataHandler.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/MetadataHandler.kt
@@ -72,7 +72,7 @@ object MetadataHandler {
         return try {
             makeMetadataObject(results)
         } finally {
-            results?.close()
+            results.close()
         }
     }