diff --git a/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.java b/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.java
deleted file mode 100644
index b559c7af7e..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package info.nightscout.androidaps.logging;
-
-import android.os.Bundle;
-
-/**
- * Created by mike on 14.08.2017.
- */
-
-public class BundleLogger {
-    public static String log(Bundle bundle) {
-        if (bundle == null) {
-            return null;
-        }
-        String string = "Bundle{";
-        for (String key : bundle.keySet()) {
-            string += " " + key + " => " + bundle.get(key) + ";";
-        }
-        string += " }Bundle";
-        return string;
-    }
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.kt b/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.kt
new file mode 100644
index 0000000000..205b52f3df
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/logging/BundleLogger.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.logging
+
+import android.os.Bundle
+
+object BundleLogger {
+
+    fun log(bundle: Bundle?): String {
+        if (bundle == null) {
+            return "null"
+        }
+        var string = "Bundle{"
+        for (key in bundle.keySet()) {
+            string += " " + key + " => " + bundle[key] + ";"
+        }
+        string += " }Bundle"
+        return string
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java
deleted file mode 100644
index e21d981c85..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.common;
-
-public enum ManufacturerType {
-
-    AndroidAPS("AndroidAPS"),
-    Medtronic("Medtronic"),
-    Sooil("SOOIL"),
-
-    Tandem("Tandem"),
-    Insulet("Insulet"),
-    Animas("Animas"),
-    Cellnovo("Cellnovo"),
-    Roche("Roche"),
-    Ypsomed("Ypsomed");
-
-
-
-    private final String description;
-
-    ManufacturerType(String description) {
-
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
new file mode 100644
index 0000000000..47b977e5d8
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.common
+
+enum class ManufacturerType(val description: String) {
+    AndroidAPS("AndroidAPS"),
+    Medtronic("Medtronic"),
+    Sooil("SOOIL"),
+    Tandem("Tandem"),
+    Insulet("Insulet"),
+    Animas("Animas"),
+    Cellnovo("Cellnovo"),
+    Roche("Roche"),
+    Ypsomed("Ypsomed");
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index 6156142755..4966ccc85a 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -88,7 +88,7 @@ class ProfileFunctionImplementation @Inject constructor(
         }
         if (activeTreatments.profileSwitchesFromHistory.size() > 0) {
             val bundle = Bundle()
-            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "CatchedError")
+            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "CaughtError")
             bundle.putString(FirebaseAnalytics.Param.START_DATE, time.toString())
             bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_NAME, activeTreatments.profileSwitchesFromHistory.toString())
             fabricPrivacy.logCustom(bundle)
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
index 4d5f08cb4d..bfc9014b0b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
@@ -25,7 +25,7 @@ class RunningConfiguration @Inject constructor(
 ) {
 
     private var counter = 0
-    private val every = 20 // Send only every 20 devicestatus to save traffic
+    private val every = 20 // Send only every 20 device status to save traffic
 
     // called in AAPS mode only
     fun configuration(): JSONObject {
@@ -83,7 +83,7 @@ class RunningConfiguration @Inject constructor(
             val pumpType = JsonHelper.safeGetString(configuration, "pump", PumpType.GenericAAPS.description)
             sp.putString(R.string.key_virtualpump_type, pumpType)
             activePlugin.activePump.pumpDescription.setPumpDescription(PumpType.getByDescription(pumpType))
-            aapsLogger.debug(LTag.CORE, "Changing pump type to ${pumpType}")
+            aapsLogger.debug(LTag.CORE, "Changing pump type to $pumpType")
         }
 
         if (configuration.has("overviewConfiguration"))
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
index a3df7d43c6..4fdad451e3 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
@@ -140,7 +140,7 @@ fun String.numericVersionPart(): String =
     "(((\\d+)\\.)+(\\d+))(\\D(.*))?".toRegex().matchEntire(this)?.groupValues?.getOrNull(1)
         ?: ""
 
-fun findVersion(file: String?): String? {
+@Suppress("unused") fun findVersion(file: String?): String? {
     val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
     return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
 }