diff --git a/app/build.gradle b/app/build.gradle
index c2b27468c..fdf476805 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     })
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.fragment:fragment-ktx:1.7.0-beta01'
+    implementation 'androidx.fragment:fragment-ktx:1.8.0-alpha02'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.28'
@@ -89,13 +89,13 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.5.2'
     implementation 'me.aflak.libraries:bluetooth:1.3.9'
     implementation 'com.caverock:androidsvg-aar:1.4'
-    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.core:core-ktx:1.13.0"
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'me.toptas.fancyshowcase:fancyshowcaseview:1.3.3'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.connectbot:sshlib:2.2.9'
 
-    def lifecycle_version = "2.8.0-alpha03"
+    def lifecycle_version = "2.8.0-beta01"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
diff --git a/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt b/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt
index 305b1fa1d..24ab522dd 100644
--- a/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt
@@ -3,35 +3,30 @@ package io.treehouses.remote
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.preference.PreferenceManager
+import io.treehouses.remote.callback.BackPressReceiver
+import io.treehouses.remote.databinding.ActivityInitial2Binding
 import io.treehouses.remote.fragments.CommunityFragment
-import io.treehouses.remote.fragments.dialogfragments.FeedbackDialogFragment
 import io.treehouses.remote.fragments.DiscoverFragment
 import io.treehouses.remote.fragments.SettingsFragment
-import io.treehouses.remote.callback.BackPressReceiver
-import io.treehouses.remote.databinding.ActivityInitial2Binding
 import io.treehouses.remote.fragments.ShowBluetoothFileFragment
+import io.treehouses.remote.fragments.dialogfragments.FeedbackDialogFragment
 import io.treehouses.remote.ui.home.HomeFragment
 import io.treehouses.remote.utils.DialogUtils
 import io.treehouses.remote.utils.GPSService
 
 class InitialActivity : BaseInitialActivity() {
 
-    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         bind = ActivityInitial2Binding.inflate(layoutInflater)
@@ -120,8 +115,8 @@ class InitialActivity : BaseInitialActivity() {
         bind.navView.setNavigationItemSelectedListener(this)
     }
 
-    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
     override fun onBackPressed() {
+        super.onBackPressed()
         if (bind.drawerLayout.isDrawerOpen(GravityCompat.START)) bind.drawerLayout.closeDrawer(GravityCompat.START)
         else {
             val f = supportFragmentManager.findFragmentById(R.id.fragment_container)
diff --git a/app/src/main/kotlin/io/treehouses/remote/IntroActivity.kt b/app/src/main/kotlin/io/treehouses/remote/IntroActivity.kt
index 6923c10e6..03f76f7bb 100644
--- a/app/src/main/kotlin/io/treehouses/remote/IntroActivity.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/IntroActivity.kt
@@ -54,7 +54,7 @@ class IntroActivity : AppCompatActivity() {
     }
     class IntroSlideWelcome(val listener: IntroPagerListener) : Fragment() {
         private lateinit var welcomeBind: IntroScreenWelcomeBinding
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
             welcomeBind = IntroScreenWelcomeBinding.inflate(inflater, container, false)
             return welcomeBind.root
         }
@@ -67,7 +67,7 @@ class IntroActivity : AppCompatActivity() {
 
     class IntroSlideDownload(val listener: IntroPagerListener) : Fragment() {
         private lateinit var downloadBind: IntroScreenDownloadBinding
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
             downloadBind = IntroScreenDownloadBinding.inflate(inflater, container, false)
             return downloadBind.root
         }
@@ -84,7 +84,7 @@ class IntroActivity : AppCompatActivity() {
 
     class IntroSlideBluetooth(val listener: IntroPagerListener) : Fragment() {
         private lateinit var bluetoothBind: IntroScreenBluetoothBinding
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
             bluetoothBind = IntroScreenBluetoothBinding.inflate(inflater, container, false)
             return bluetoothBind.root
         }
diff --git a/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt b/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt
index 4456f1360..ad8ed48e4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt
@@ -7,21 +7,15 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.content.res.Configuration
 import android.os.Build
 import android.os.IBinder
-import android.util.DisplayMetrics
-import android.view.WindowManager
-import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.preference.PreferenceManager
-import androidx.preference.SeekBarPreference
 import com.parse.Parse
 import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.utils.SaveUtils
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE
-import java.util.*
 
 class MainApplication : Application() {
     var logSent = false
diff --git a/app/src/main/kotlin/io/treehouses/remote/PreferenceConstants.kt b/app/src/main/kotlin/io/treehouses/remote/PreferenceConstants.kt
index b01179a82..18ee98bd7 100644
--- a/app/src/main/kotlin/io/treehouses/remote/PreferenceConstants.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/PreferenceConstants.kt
@@ -16,8 +16,6 @@
  */
 package io.treehouses.remote
 
-import android.os.Build
-
 /**
  * @author Kenny Root
  */
diff --git a/app/src/main/kotlin/io/treehouses/remote/SplashScreenActivity.kt b/app/src/main/kotlin/io/treehouses/remote/SplashScreenActivity.kt
index 7370aad4e..6c4fede46 100644
--- a/app/src/main/kotlin/io/treehouses/remote/SplashScreenActivity.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/SplashScreenActivity.kt
@@ -3,17 +3,14 @@ package io.treehouses.remote
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.util.DisplayMetrics
-import android.util.TypedValue
 import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
@@ -54,9 +51,7 @@ class SplashScreenActivity : AppCompatActivity() {
             wm.defaultDisplay.getMetrics(metrics)
             metrics.scaledDensity = configuration.fontScale * metrics.density
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                baseContext.applicationContext.createConfigurationContext(it)
-            }
+            baseContext.applicationContext.createConfigurationContext(it)
             baseContext.resources.displayMetrics.setTo(metrics)
 
         }
diff --git a/app/src/main/kotlin/io/treehouses/remote/Tutorials.kt b/app/src/main/kotlin/io/treehouses/remote/Tutorials.kt
index 828af62d3..6929c21be 100644
--- a/app/src/main/kotlin/io/treehouses/remote/Tutorials.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/Tutorials.kt
@@ -180,7 +180,7 @@ object Tutorials {
         show(a, b, c, d, e, f)
     }
 
-    public fun fancyShowCaseViewBuilderSkippable(activity: FragmentActivity, view: View, title: String, focusShape: FocusShape = FocusShape.CIRCLE): FancyShowCaseView.Builder {
+    fun fancyShowCaseViewBuilderSkippable(activity: FragmentActivity, view: View, title: String, focusShape: FocusShape = FocusShape.CIRCLE): FancyShowCaseView.Builder {
         return fancyShowCaseViewBuilder(activity, view, title, focusShape)
                 .customView(R.layout.tutorial, object : OnViewInflateListener {
                     override fun onViewInflated(view: View) {
@@ -192,7 +192,7 @@ object Tutorials {
                 })
     }
 
-    public fun fancyShowCaseViewBuilder(activity: FragmentActivity, view: View, title: String, focusShape: FocusShape = FocusShape.CIRCLE): FancyShowCaseView.Builder {
+    fun fancyShowCaseViewBuilder(activity: FragmentActivity, view: View, title: String, focusShape: FocusShape = FocusShape.CIRCLE): FancyShowCaseView.Builder {
         return FancyShowCaseView.Builder(activity)
                 .focusOn(view)
                 .title(title)
diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/RPIListAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/RPIListAdapter.kt
index a1fff6687..4902f42f0 100644
--- a/app/src/main/kotlin/io/treehouses/remote/adapter/RPIListAdapter.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/adapter/RPIListAdapter.kt
@@ -13,7 +13,7 @@ import io.treehouses.remote.callback.DeviceDeleteListener
 import io.treehouses.remote.pojo.DeviceInfo
 
 class RPIListAdapter(private val mContext: Context, private val data: List<DeviceInfo>) : ArrayAdapter<DeviceInfo?>(mContext, 0, data) {
-    public var deviceListener: DeviceDeleteListener? = null
+    var deviceListener: DeviceDeleteListener? = null
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
         // Get the data item for this position
         var newView = convertView
diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/SystemListAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/SystemListAdapter.kt
index dd0a3d44c..e7228df66 100644
--- a/app/src/main/kotlin/io/treehouses/remote/adapter/SystemListAdapter.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/adapter/SystemListAdapter.kt
@@ -8,16 +8,13 @@ import android.view.ViewGroup
 import android.widget.BaseExpandableListAdapter
 import android.widget.TextView
 import androidx.annotation.RequiresApi
-import androidx.fragment.app.FragmentActivity
 import io.treehouses.remote.R
-import io.treehouses.remote.Tutorials
 import io.treehouses.remote.callback.HomeInteractListener
 import io.treehouses.remote.pojo.NetworkListItem
-import io.treehouses.remote.utils.logD
 
 class SystemListAdapter(val context: Context, list: List<NetworkListItem>) : BaseExpandableListAdapter() {
     private val list: List<NetworkListItem>
-    private val inflater: LayoutInflater
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
     private var listener: HomeInteractListener? = null
     private val views: MutableList<View>
     private val groupHeader: MutableList<View>
@@ -60,12 +57,15 @@ class SystemListAdapter(val context: Context, list: List<NetworkListItem>) : Bas
         return false
     }
 
-    override fun getGroupView(i: Int, b: Boolean, convertView: View?, parent: ViewGroup): View {
-        val newView: View?
-        newView = inflater.inflate(R.layout.list_group, parent, false)
-        val listHeader = newView.findViewById<TextView>(R.id.lblListHeader)
-        listHeader.text = getGroup(i).toString()
-        groupHeader.add(newView)
+    override fun getGroupView(i: Int, b: Boolean, convertView: View?, parent: ViewGroup): View? {
+        val newView: View? = inflater.inflate(R.layout.list_group, parent, false)
+        val listHeader = newView?.findViewById<TextView>(R.id.lblListHeader)
+        if (listHeader != null) {
+            listHeader.text = getGroup(i).toString()
+        }
+        if (newView != null) {
+            groupHeader.add(newView)
+        }
         return newView
     }
 
@@ -104,7 +104,6 @@ class SystemListAdapter(val context: Context, list: List<NetworkListItem>) : Bas
     }
 
     init {
-        inflater = LayoutInflater.from(context)
         this.list = list
         views = mutableListOf()
         groupHeader = mutableListOf()
diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt
index bdf878923..7d2538f97 100644
--- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt
@@ -130,7 +130,7 @@ class ViewHolderSSH2FA internal constructor(v: View, private val c: Context, lis
 
     private fun openAuthenticator(key:String){
         val uri:String = "otpauth://totp/" + "pi@treehouses" + "?secret=" + key + "&issuer=treehouses"
-        val intent:Intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
 
         if (Utils.checkAppIsInstalled(c, v, intent, arrayOf("No Authenticator Client Installed on your Device", "Install", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"))) return
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderVnc.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderVnc.kt
index 46525185f..1f8b03ae5 100644
--- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderVnc.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderVnc.kt
@@ -38,7 +38,7 @@ class ViewHolderVnc internal constructor(v: View, context: Context, listener: Ho
     init {
         listener.sendMessage(context.getString(R.string.TREEHOUSES_VNC))
         val btnStartConfig = v.findViewById<Button>(R.id.btn_start_config)
-        vnc = v.findViewById<Switch>(R.id.switchVnc)
+        vnc = v.findViewById(R.id.switchVnc)
         editTextIp = v.findViewById(R.id.editTextIp)
         btnStartConfig.setOnClickListener { openVnc(context, v, editTextIp) }
         vnc.setOnClickListener {
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseBottomSheetDialog.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseBottomSheetDialog.kt
index 5d1aa4e1e..f2207c70f 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseBottomSheetDialog.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseBottomSheetDialog.kt
@@ -1,11 +1,7 @@
 package io.treehouses.remote.bases
 
-import android.app.Dialog
 import android.content.Context
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import io.treehouses.remote.R
 import io.treehouses.remote.callback.HomeInteractListener
 
 open class BaseBottomSheetDialog : BottomSheetDialogFragment() {
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
index 18966cc34..4087add5d 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt
@@ -10,15 +10,13 @@ import android.os.Message
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import io.treehouses.remote.Constants
-import io.treehouses.remote.R
-import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.callback.HomeInteractListener
+import io.treehouses.remote.network.BluetoothChatService
 import io.treehouses.remote.utils.DialogUtils
 import io.treehouses.remote.utils.logE
-import java.lang.NullPointerException
 
 open class BaseFragment : Fragment() {
-    var lastMessage = " ";
+    var lastMessage = " "
     open lateinit var mChatService: BluetoothChatService
     var mBluetoothAdapter: BluetoothAdapter? = null
     lateinit var listener: HomeInteractListener
@@ -80,8 +78,7 @@ open class BaseFragment : Fragment() {
     open fun setupChat() {}
     open fun getMessage(msg: Message) {}
 
-    public fun writeMessage(msg: String)
-    {
+    fun writeMessage(msg: String) {
         lastMessage = msg
         listener.sendMessage(msg)
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt
index 4e264d0ff..755876541 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt
@@ -254,9 +254,9 @@ open class BaseSSH : ConnectionMonitor, InteractiveCallback, AuthAgentCallback {
                 if (useAuthAgent != "no") it.requestAuthAgentForwarding(this)
                 it.requestPTY(emulation, columns, rows, width, height, null)
                 it.startShell()
-                stdin = it.getStdin()
-                stdout = it.getStdout()
-                stderr = it.getStderr()
+                stdin = it.stdin
+                stdout = it.stdout
+                stderr = it.stderr
 
             }
             isSessionOpen = true
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt
index 129b83bac..167f1f6b0 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt
@@ -92,7 +92,7 @@ open class BaseSSHConfig: BaseFragment(), RVButtonClickListener, OnHostStatusCha
 
     override fun onButtonClick(position: Int) {
         val edit = EditHostDialogFragment()
-        edit.setOnDismissListener(DialogInterface.OnDismissListener { setUpAdapter() })
+        edit.setOnDismissListener { setUpAdapter() }
         edit.arguments = Bundle().apply { putString(EditHostDialogFragment.SELECTED_HOST_URI, pastHosts[position].uri.toString())}
         edit.show(childFragmentManager, "EditHost")
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt
index 5740b1e28..e135d0329 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt
@@ -141,7 +141,7 @@ open class BaseTerminalBridge : VDUDisplay {
         synchronized(localOutput) {
             for (line in output.split("\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()) {
                 var line = line
-                if (line.length > 0 && line[line.length - 1] == '\r') {
+                if (line.isNotEmpty() && line[line.length - 1] == '\r') {
                     line = line.substring(0, line.length - 1)
                 }
                 val s = "$line\r\n"
@@ -316,14 +316,14 @@ open class BaseTerminalBridge : VDUDisplay {
      * and pasting clipboard.
      */
     fun injectString(string: String?) {
-        if (string == null || string.length == 0) return
-        val injectStringThread = Thread(Runnable {
+        if (string.isNullOrEmpty()) return
+        val injectStringThread = Thread {
             try {
                 transport!!.write(string.toByteArray(charset(host!!.encoding)))
             } catch (e: Exception) {
                 logE("Couldn't inject string to remote host: $e")
             }
-        })
+        }
         injectStringThread.name = "InjectString"
         injectStringThread.start()
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt
index 561371326..b813791c0 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt
@@ -24,7 +24,7 @@ open class FragmentViewModel(application: Application) : AndroidViewModel(applic
     /**
      * Monitors connection Status (has the specific connection state)
      */
-    private val _connectionStatus = MutableLiveData<Int>(Constants.STATE_NONE)
+    private val _connectionStatus = MutableLiveData(Constants.STATE_NONE)
     val connectionStatus : LiveData<Int>
         get() = _connectionStatus
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/PermissionActivity.kt b/app/src/main/kotlin/io/treehouses/remote/bases/PermissionActivity.kt
index 1cc4b86af..75c9d1119 100644
--- a/app/src/main/kotlin/io/treehouses/remote/bases/PermissionActivity.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/bases/PermissionActivity.kt
@@ -2,7 +2,6 @@ package io.treehouses.remote.bases
 
 import android.Manifest
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.location.LocationManager
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt
index d65a1485c..62991d6f5 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt
@@ -19,7 +19,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 class AboutFragment : Fragment() {
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view: View = inflater.inflate(R.layout.fragment_about, container, false)
 
         setHyperlinks(view)
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt
index 5a1e4909d..eac81cf7b 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt
@@ -12,7 +12,7 @@ import io.treehouses.remote.databinding.FragmentCommunityBinding
 
 class CommunityFragment : BaseFragment(), BackPressReceiver {
     private lateinit var bind: FragmentCommunityBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = FragmentCommunityBinding.inflate(inflater, container, false)
         return bind.root
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt
index 7961e5067..99afa49a6 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt
@@ -35,7 +35,7 @@ class DiscoverFragment : BaseFragment(), FragmentDialogInterface {
     private var piIP = ""
     private var deviceList = ArrayList<Device>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityDiscoverFragmentBinding.inflate(inflater, container, false)
         mChatService = listener.getChatService()
         mChatService.updateHandler(mHandler)
@@ -197,8 +197,11 @@ class DiscoverFragment : BaseFragment(), FragmentDialogInterface {
         var text: String? = null
 
         if (res != null) {
-            if (separator == "") text = res.value
-            else text = res.value.split(separator.toRegex())[1]
+            text = if (separator == "") {
+                res.value
+            } else {
+                res.value.split(separator.toRegex())[1]
+            }
         }
 
         return text
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt
index 640c262dc..5c3841d8e 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt
@@ -29,7 +29,7 @@ class ServiceCardFragment : Fragment(), View.OnClickListener {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = ServiceCardBinding.inflate(inflater, container, false)
         binding!!.serviceInfo.movementMethod = LinkMovementMethod.getInstance()
         binding!!.serviceInfo.isFocusable = true
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt
index 9613df6a1..3e76bbd1a 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt
@@ -4,10 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import io.treehouses.remote.bases.BaseFragment
-import io.treehouses.remote.callback.BackPressReceiver
 import io.treehouses.remote.databinding.FragmentShowBluetoothFileBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -16,7 +14,7 @@ import kotlinx.coroutines.withContext
 class ShowBluetoothFileFragment : BaseFragment() {
     private lateinit var bluetoothBind : FragmentShowBluetoothFileBinding
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bluetoothBind = FragmentShowBluetoothFileBinding.inflate(inflater, container, false)
         return bluetoothBind.root
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt
index 0ce3e8d69..012f9dab0 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt
@@ -44,7 +44,7 @@ class TerminalFragment : BaseTerminalFragment() {
      * Member object for the chat services
      */
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityTerminalFragmentBinding.inflate(inflater, container, false)
         onLoad(mHandler)
         val autocomplete = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean("autocomplete", false)
@@ -56,9 +56,9 @@ class TerminalFragment : BaseTerminalFragment() {
         expandableListDetail = HashMap()
         expandableListDetail[TITLE_EXPANDABLE] = SaveUtils.getCommandsList(requireContext())
         setHasOptionsMenu(true)
-        bind.treehousesBtn.text = null;
-        bind.treehousesBtn.textOn = null;
-        bind.treehousesBtn.textOff = null;
+        bind.treehousesBtn.text = null
+        bind.treehousesBtn.textOn = null
+        bind.treehousesBtn.textOff = null
         return bind.root
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelFragment.kt
index 02ccf474a..3f7eb28c4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelFragment.kt
@@ -26,7 +26,7 @@ class TunnelFragment : BaseFragment(), ServicesListener, OnItemSelectedListener,
 //    private var tunnelView: TunnelViewPager? = null
 //    private var tunnelPageAdapter: TunnelPageAdapter? = null
     private lateinit var bind: ActivitySshTunnelFragmentBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivitySshTunnelFragmentBinding.inflate(inflater, container, false)
         tabLayout = bind.tabLayout
         tabLayout!!.tabGravity = TabLayout.GRAVITY_FILL
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt
index abd83d3e6..e3b2323c3 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt
@@ -15,7 +15,7 @@ import io.treehouses.remote.databinding.DialogBluetoothTroubleshootingBinding
 
 class BluetoothFailedDialogFragment : FullScreenDialogFragment() {
     lateinit var bind : DialogBluetoothTroubleshootingBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogBluetoothTroubleshootingBinding.inflate(inflater, container, false)
         dialog!!.window!!.setBackgroundDrawable(InsetDrawable(ColorDrawable(Color.TRANSPARENT), 30))
         return bind.root
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt
index fd0ac1f56..57f24a366 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt
@@ -19,7 +19,7 @@ class DeleteSSHKeyFragment : FullScreenDialogFragment() {
     private lateinit var keyToDelete : String
     private lateinit var dismissListener : DialogInterface.OnDismissListener
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogDeleteSshKeyBinding.inflate(inflater, container, false)
         dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
         keyToDelete = arguments?.getString(KEY_TO_DELETE)!!
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt
index d98c5a1a1..d4d4fb786 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt
@@ -26,7 +26,7 @@ class EditHostDialogFragment : FullScreenDialogFragment(), FragmentDialogInterfa
     private lateinit var allKeys: List<String>
     private lateinit var dismissListener : DialogInterface.OnDismissListener
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = EditHostBinding.inflate(inflater, container, false)
         logD("${BaseTerminalBridge.TAG} ARGUMENT: ${arguments?.getString(SELECTED_HOST_URI, "")!!}")
         host = SaveUtils.getHost(requireContext(), arguments?.getString(SELECTED_HOST_URI, "")!!)!!
@@ -68,7 +68,7 @@ class EditHostDialogFragment : FullScreenDialogFragment(), FragmentDialogInterfa
 
     private fun setUpKeys() {
         allKeys = mutableListOf(NO_KEY).plus(KeyUtils.getAllKeyNames(requireContext()))
-        bind.selectKey.adapter = ArrayAdapter<String>(
+        bind.selectKey.adapter = ArrayAdapter(
                 requireContext(),
                 R.layout.key_type_spinner_item,
                 R.id.itemTitle,
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt
index 78bad5548..1ef78353b 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt
@@ -19,7 +19,7 @@ import java.util.*
 class FeedbackDialogFragment : FullScreenDialogFragment() {
     private lateinit var bind: DialogFeedbackBinding
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogFeedbackBinding.inflate(inflater, container, false)
 
         val back = ColorDrawable(Color.TRANSPARENT)
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt
index c96431bb7..a0a442c44 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt
@@ -25,12 +25,12 @@ class HelpDialogFragment : FullScreenDialogFragment(), android.widget.SearchView
     private lateinit var bind: DialogHelpBinding
     private var jsonString = ""
     private val items = mutableListOf<HelpCommand>()
-    private val excludedHelpItems = listOf<String>("anime")
+    private val excludedHelpItems = listOf("anime")
     private var queryText = ""
 
     private var selectedItem: HelpCommand = HelpCommand()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogHelpBinding.inflate(inflater, container, false)
         bind.progressBar.visibility = View.VISIBLE
         val back = ColorDrawable(Color.TRANSPARENT)
@@ -93,7 +93,7 @@ class HelpDialogFragment : FullScreenDialogFragment(), android.widget.SearchView
         updateHighlight(item)
     }
 
-    private fun highlight(original: String, word: String): Spannable? {
+    private fun highlight(original: String, word: String): Spannable {
         val highlighted: Spannable = SpannableString(original)
         if (original.isEmpty() || word.isEmpty()) return highlighted
         var start = original.indexOf(word)
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt
index fc6e5b105..589df3840 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt
@@ -234,12 +234,13 @@ class RPIDialogFragment : BaseDialogFragment(), DeviceDeleteListener {
         }
 
         fun checkPiAddress(deviceHardwareAddress: String): Boolean {
-            val piAddress: Set<String> = HashSet(listOf("B8:27:EB", "DC:A6:32", "E4:5F:01", "28:CD:C1", "D8:3A:DD",
-                                                        "B8-27-EB", "DC-A6-32", "E4-5F-01", "28-CD-C1", "D8-3A-DD",
-                                                        "B827.EB", "DCA6.32", "E45F.01", "28CD.C1", "D83A.DD",
-                                                        "b8:27:eb", "dc:a6:32", "e4:5f:01", "28:cd:c1", "d8:3a:dd",
-                                                        "b8-27-eb", "dc-a6-32", "e4-5f-01", "28-cd-c1", "d8-3a-dd",
-                                                        "b827.eb", "dca6.32", "e45f.01", "28cd.c1", "d83a.dd"))
+            val piAddress: Set<String> = HashSet(listOf(
+                "B8:27:EB", "DC:A6:32", "E4:5F:01", "28:CD:C1", "D8:3A:DD", "2C:CF:67",
+                "B8-27-EB", "DC-A6-32", "E4-5F-01", "28-CD-C1", "D8-3A-DD", "2C-CF-67",
+                "B827.EB", "DCA6.32", "E45F.01", "28CD.C1", "D83A.DD", "2CCF.67",
+                "b8:27:eb", "dc:a6:32", "e4:5f:01", "28:cd:c1", "d8:3a:dd", "2c:cf:67",
+                "b8-27-eb", "dc-a6-32", "e4-5f-01", "28-cd-c1", "d8-3a-dd", "2c-cf-67",
+                "b827.eb", "dca6.32", "e45f.01", "28cd.c1", "d83a.dd", "2ccf.67"))
             for (item in piAddress) {
                 if (deviceHardwareAddress.contains(item)) return true
             }
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt
index b41312690..6f30d1adf 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt
@@ -3,7 +3,6 @@ package io.treehouses.remote.fragments.dialogfragments
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -12,12 +11,12 @@ import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import io.treehouses.remote.Constants
 import io.treehouses.remote.R
-import io.treehouses.remote.ssh.beans.PubKeyBean
 import io.treehouses.remote.adapter.ViewHolderSSHAllKeyRow
 import io.treehouses.remote.bases.FullScreenDialogFragment
 import io.treehouses.remote.callback.KeyMenuListener
 import io.treehouses.remote.databinding.DialogViewKeysBinding
 import io.treehouses.remote.databinding.RowKeyBinding
+import io.treehouses.remote.ssh.beans.PubKeyBean
 import io.treehouses.remote.utils.KeyUtils
 import io.treehouses.remote.utils.KeyUtils.getOpenSSH
 
@@ -26,7 +25,7 @@ class SSHAllKeyFragment : FullScreenDialogFragment(), KeyMenuListener {
     private lateinit var bind : DialogViewKeysBinding
 
     private lateinit var allKeys: List<PubKeyBean>
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogViewKeysBinding.inflate(inflater, container, false)
         dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
         return bind.root
@@ -35,13 +34,13 @@ class SSHAllKeyFragment : FullScreenDialogFragment(), KeyMenuListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         bind.doneBtn.setOnClickListener { dismiss() }
-        registerForContextMenu(bind.allKeys);
+        registerForContextMenu(bind.allKeys)
         setUpKeys()
     }
 
     private fun setUpKeys() {
         allKeys = KeyUtils.getAllKeys(requireContext())
-        if (allKeys.isNullOrEmpty()) {
+        if (allKeys.isEmpty()) {
             bind.noHosts.visibility = View.VISIBLE
             bind.allKeys.visibility = View.GONE
         } else {
@@ -94,7 +93,7 @@ class SSHAllKeyFragment : FullScreenDialogFragment(), KeyMenuListener {
                 putString(DeleteSSHKeyFragment.KEY_TO_DELETE, allKeys[position].nickname)
             }
         }
-        dialog.setOnDismissListener(DialogInterface.OnDismissListener { setUpKeys() })
+        dialog.setOnDismissListener { setUpKeys() }
         dialog.show(parentFragmentManager, "Delete_key")
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt
index 4369974e9..a86599db4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt
@@ -15,7 +15,7 @@ import io.treehouses.remote.databinding.KeysDialogBinding
 import io.treehouses.remote.utils.KeyUtils
 
 class SSHKeyGenFragment: BaseSSHKeyGen() {
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = KeysDialogBinding.inflate(inflater, container, false)
         dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
         allKeys = KeyUtils.getAllKeyNames(requireContext())
@@ -26,7 +26,7 @@ class SSHKeyGenFragment: BaseSSHKeyGen() {
         super.onViewCreated(view, savedInstanceState)
         bind.cancelButton.setOnClickListener { dismiss() }
 
-        bind.keyTypeSpinner.adapter = ArrayAdapter<String>(
+        bind.keyTypeSpinner.adapter = ArrayAdapter(
                 requireContext(),
                 R.layout.key_type_spinner_item,
                 R.id.itemTitle,
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt
index f68e95849..90c65b4e9 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt
@@ -56,7 +56,7 @@ class GeneralPreferenceFragment: BasePreferenceFragment() {
     }
 
     private fun reactivateTutorials() {
-        for(screen in SaveUtils.Screens.values()) SaveUtils.setFragmentFirstTime(requireContext(), screen, true)
+        for(screen in SaveUtils.Screens.entries) SaveUtils.setFragmentFirstTime(requireContext(), screen, true)
         Toast.makeText(context, "Tutorials reactivated", Toast.LENGTH_LONG).show()
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt
index d5aa9649e..74768e27d 100644
--- a/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt
@@ -1,14 +1,11 @@
 package io.treehouses.remote.fragments.preferencefragments
 
 import android.content.Context
-import android.content.SharedPreferences
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.WindowManager
 import android.widget.Toast
-import androidx.annotation.RequiresApi
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import io.treehouses.remote.MainApplication
@@ -42,7 +39,6 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
         SettingsUtils.setClickListener(this, clearSSHKeys)
     }
 
-    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     fun adjustFontScale(configuration: Configuration?, fontSize: Int) {
         configuration?.let {
             it.fontScale = 0.05F*fontSize.toFloat()
diff --git a/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt b/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt
index 9788bc2fd..16e0f2283 100644
--- a/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt
@@ -87,7 +87,7 @@ class BluetoothChatService @JvmOverloads constructor(handler: Handler? = null, a
         mHandler = handler
     }
 
-    override fun onBind(intent: Intent?): IBinder? {
+    override fun onBind(intent: Intent?): IBinder {
         return mBinder
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/pojo/ReverseData.kt b/app/src/main/kotlin/io/treehouses/remote/pojo/ReverseData.kt
index 13aab2e58..185d6a25c 100644
--- a/app/src/main/kotlin/io/treehouses/remote/pojo/ReverseData.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/pojo/ReverseData.kt
@@ -1,8 +1,5 @@
 package io.treehouses.remote.pojo
 
-import java.io.Serializable
-import java.util.HashMap
-
 data class ReverseData(val ip: String = "",
                        val postal: String = "",
                        val city: String = "",
diff --git a/app/src/main/kotlin/io/treehouses/remote/pojo/StatusData.kt b/app/src/main/kotlin/io/treehouses/remote/pojo/StatusData.kt
index b12437718..cf50c78fe 100644
--- a/app/src/main/kotlin/io/treehouses/remote/pojo/StatusData.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/pojo/StatusData.kt
@@ -1,8 +1,5 @@
 package io.treehouses.remote.pojo
 
-import java.io.Serializable
-import java.util.HashMap
-
 data class StatusData(val status: String = "",
                         val hostname: String = "",
                         val arm: String = "",
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt
index 559c78c59..defe7c3ef 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt
@@ -76,7 +76,7 @@ class PromptHelper(private val tag: Any) {
      */
     @Throws(InterruptedException::class)
     private fun requestPrompt(instructions: String?, hint: String, type: Any): Any? {
-        var response: Any? = null
+        val response: Any?
         promptToken.acquire()
         try {
             promptInstructions = instructions
@@ -115,10 +115,4 @@ class PromptHelper(private val tag: Any) {
         }
     }
 
-    init {
-
-        // Threads must acquire this before they can send a prompt.
-
-        // Responses will release this semaphore.
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt
index c2e81ff73..8749310ab 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt
@@ -95,12 +95,12 @@ object PubKeyUtils {
     }
 
     fun getBitStrength(encoded : ByteArray, keyType: String) : Int {
-        val pubKey = decodeKey(encoded, keyType, "public");
+        val pubKey = decodeKey(encoded, keyType, "public")
         return when (keyType) {
-            PubKeyBean.KEY_TYPE_RSA -> (pubKey as RSAPublicKey).modulus.bitLength();
-            PubKeyBean.KEY_TYPE_DSA -> 1024;
-            PubKeyBean.KEY_TYPE_EC -> (pubKey as ECPublicKey).params.curve.field.fieldSize;
-            PubKeyBean.KEY_TYPE_ED25519 -> 256;
+            PubKeyBean.KEY_TYPE_RSA -> (pubKey as RSAPublicKey).modulus.bitLength()
+            PubKeyBean.KEY_TYPE_DSA -> 1024
+            PubKeyBean.KEY_TYPE_EC -> (pubKey as ECPublicKey).params.curve.field.fieldSize
+            PubKeyBean.KEY_TYPE_ED25519 -> 256
             else -> { 0; }
         }
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt
index 8426e4594..734c66e32 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt
@@ -87,7 +87,7 @@ class SSH: BaseSSH {
 
         if (manager!!.loadedKeypairs.containsKey(pubkey.nickname)) {
             // load this key from memory if its already there
-            logD("${String.format("Found unlocked key '%s' already in-memory", pubkey.nickname)}")
+            logD(String.format("Found unlocked key '%s' already in-memory", pubkey.nickname))
             if (pubkey.isConfirmUse) {
                 if (!promptForPubkeyUse(pubkey.nickname)) return false
             }
@@ -127,7 +127,7 @@ class SSH: BaseSSH {
         // convert key to trilead format
         val pair = KeyPair(pubKey, privKey)
         logD("Unlocked key ${PubKeyUtils.formatKey(pubKey)}")
-        logD("${String.format("Unlocked key '%s'", pubkey.nickname)}")
+        logD(String.format("Unlocked key '%s'", pubkey.nickname))
 
         // save this key in memory
         manager!!.addKey(pubkey, pair)
@@ -216,7 +216,7 @@ class SSH: BaseSSH {
         // use a specific key for this host, as requested
         val pubkey = KeyUtils.getKey(manager!!.applicationContext, pubkeyId)
 
-        if (pubkey == null) bridge?.outputLine(manager!!.res!!.getString(R.string.terminal_auth_pubkey_invalid));
+        if (pubkey == null) bridge?.outputLine(manager!!.res!!.getString(R.string.terminal_auth_pubkey_invalid))
         else if (tryPublicKey(pubkey)) finishConnection()
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt
index 6c08d5bd9..cf4ca1056 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt
@@ -82,9 +82,8 @@ class HostBean {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
-        var flag = false
         other as HostBean
-        flag = when {
+        val flag: Boolean = when {
             nickname != other.nickname -> false
             hostname != other.hostname -> false
             username != other.username -> false
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt
index 0c894b54f..bb35c6bc9 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt
@@ -9,8 +9,8 @@ import java.security.spec.InvalidKeySpecException
 /**
  * @author Kenny Root
  */
-class PubKeyBean constructor(var nickname: String = "",
-                             var type: String = "RSA", var privateKey: ByteArray? = null, var publicKey: ByteArray? = null) {
+class PubKeyBean(var nickname: String = "",
+                 var type: String = "RSA", var privateKey: ByteArray? = null, var publicKey: ByteArray? = null) {
     /* Database fields */
 //    var id: Long = 0
 //    var nickname: String = ""
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt
index 59672f019..e176569dc 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt
@@ -83,7 +83,7 @@ class SelectionArea {
     }
 
     fun getTop(): Int {
-        return Math.min(top, bottom)
+        return top.coerceAtMost(bottom)
     }
 
     private fun setBottom(bottom: Int) {
@@ -91,7 +91,7 @@ class SelectionArea {
     }
 
     fun getBottom(): Int {
-        return Math.max(top, bottom)
+        return top.coerceAtLeast(bottom)
     }
 
     fun decrementColumn() {
@@ -114,7 +114,7 @@ class SelectionArea {
     }
 
     fun getLeft(): Int {
-        return Math.min(left, right)
+        return left.coerceAtMost(right)
     }
 
     private fun setRight(right: Int) {
@@ -122,7 +122,7 @@ class SelectionArea {
     }
 
     fun getRight(): Int {
-        return Math.max(left, right)
+        return left.coerceAtLeast(right)
     }
 
     fun copyFrom(vb: VDUBuffer): String {
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt
index 766d8fdcd..4711cd4f7 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt
@@ -1,9 +1,14 @@
 package io.treehouses.remote.ssh.terminal
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.*
+import android.graphics.Canvas
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RectF
 import androidx.preference.PreferenceManager
 import android.text.ClipboardManager
 import android.view.KeyEvent
@@ -13,8 +18,8 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import android.widget.FrameLayout
 import android.widget.Toast
-import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener
 import io.treehouses.remote.bases.BaseTerminalKeyListener
+import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener
 
 open class BaseTerminalView(context: Context, bridge: TerminalBridge, pager: TerminalViewPager) : FrameLayout(context), FontSizeChangedListener {
 
@@ -44,7 +49,6 @@ open class BaseTerminalView(context: Context, bridge: TerminalBridge, pager: Ter
     var mAccessibilityActive = true
 
 
-    @TargetApi(11)
     fun setLayerTypeToSoftware() {
         setLayerType(View.LAYER_TYPE_SOFTWARE, null)
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt
index f8f1efa82..194ec0518 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt
@@ -14,7 +14,7 @@ object PatternHolder {
         val userinfo = "(?:$unreserved|$pctEncoded|$subDelims|:)*"
         val h16 = "[0-9A-Fa-f]{1,4}"
         val decOctet = "(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
-        val ipv4address: String = "$decOctet\\.$decOctet\\.$decOctet\\.$decOctet"
+        val ipv4address = "$decOctet\\.$decOctet\\.$decOctet\\.$decOctet"
         val ls32 = "(?:$h16:$h16|$ipv4address)"
         val ipv6address = "(?:(?:$h16){6}$ls32)"
         val ipvfuture = "v[0-9A-Fa-f]+.(?:$unreserved|$subDelims|:)+"
@@ -24,15 +24,15 @@ object PatternHolder {
         val port = "[0-9]*"
         val authority = "(?:$userinfo@)?$host(?::$port)?"
         val pchar = "(?:$unreserved|$pctEncoded|$subDelims|@)"
-        val segment: String = "$pchar*"
+        val segment = "$pchar*"
         val pathAbempty = "(?:/$segment)*"
-        val segmentNz: String = "$pchar+"
+        val segmentNz = "$pchar+"
         val pathAbsolute = "/(?:$segmentNz(?:/$segment)*)?"
-        val pathRootless: String = "$segmentNz(?:/$segment)*"
+        val pathRootless = "$segmentNz(?:/$segment)*"
         val hierPart = "(?://$authority$pathAbempty|$pathAbsolute|$pathRootless)"
         val query = "(?:$pchar|/|\\?)*"
         val fragment = "(?:$pchar|/|\\?)*"
-        val uriRegex: String = "$scheme:$hierPart(?:$query)?(?:#$fragment)?"
+        val uriRegex = "$scheme:$hierPart(?:$query)?(?:#$fragment)?"
         urlPattern = Pattern.compile(uriRegex)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt
index 94f8d7eef..a6b9af1b7 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt
@@ -165,7 +165,7 @@ class TerminalBridge : DerivedTerminalBridge {
 //				transport.addPortForward(portForward);
 //		}
         outputLine(manager!!.res!!.getString(R.string.terminal_connecting, host!!.hostname, host!!.port, host!!.protocol))
-        val connectionThread = Thread(Runnable { transport!!.connect() })
+        val connectionThread = Thread { transport!!.connect() }
         connectionThread.name = "Connection"
         connectionThread.isDaemon = true
         connectionThread.start()
@@ -250,7 +250,9 @@ class TerminalBridge : DerivedTerminalBridge {
 
         // disconnection request hangs if we havent really connected to a host yet
         // temporary fix is to just spawn disconnection into a thread
-        val disconnectThread = Thread(Runnable { if (transport != null && transport!!.isConnected) transport!!.close() })
+        val disconnectThread = Thread { if (transport != null && transport!!.isConnected) {
+            transport!!.close()
+        } }
         disconnectThread.name = "Disconnect"
         disconnectThread.start()
         if (immediate || host!!.quickDisconnect && !host!!.stayConnected) {
@@ -274,13 +276,17 @@ class TerminalBridge : DerivedTerminalBridge {
             manager!!.requestReconnect(this)
             return
         }
-        val disconnectPromptThread = Thread(Runnable {
-            val result = promptHelper!!.requestPrompt<Boolean>(null, "Host has been Disconnected. Close session?", true)
+        val disconnectPromptThread = Thread {
+            val result = promptHelper!!.requestPrompt<Boolean>(
+                null,
+                "Host has been Disconnected. Close session?",
+                true
+            )
             if (result == null || result) {
                 isAwaitingClose = true
                 triggerDisconnectListener()
             }
-        })
+        }
         disconnectPromptThread.name = "DisconnectPrompt"
         disconnectPromptThread.isDaemon = true
         disconnectPromptThread.start()
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt
index 5acf7cd5f..dc695bcdf 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt
@@ -240,7 +240,7 @@ class TerminalManager : Service(), BridgeDisconnectedListener, OnSharedPreferenc
     fun addKey(pubkey: PubKeyBean, pair: KeyPair?, force: Boolean = false) {
         if (!savingKeys && !force) return
         loadedKeypairs.remove(pubkey.nickname)
-        val sshPubKey = PubKeyUtils.extractOpenSSHPublic(pair);
+        val sshPubKey = PubKeyUtils.extractOpenSSHPublic(pair)
         val keyHolder = KeyHolder()
         keyHolder.bean = pubkey; keyHolder.pair = pair; keyHolder.openSSHPubkey = sshPubKey
         loadedKeypairs[pubkey.nickname] = keyHolder
@@ -253,7 +253,7 @@ class TerminalManager : Service(), BridgeDisconnectedListener, OnSharedPreferenc
                 }
             }, pubkey.lifetime * 1000.toLong())
         }
-        logD("${String.format("Added key '%s' to in-memory cache", pubkey.nickname)}")
+        logD(String.format("Added key '%s' to in-memory cache", pubkey.nickname))
     }
 
     fun removeKey(publicKey: ByteArray?): Boolean {
@@ -265,7 +265,7 @@ class TerminalManager : Service(), BridgeDisconnectedListener, OnSharedPreferenc
             }
         }
         return if (nickname != null) {
-            logD("${String.format("Removed key '%s' to in-memory cache", nickname)}")
+            logD(String.format("Removed key '%s' to in-memory cache", nickname))
             loadedKeypairs.remove(nickname) != null
         } else false
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt
index 8754871cf..0ec049779 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt
@@ -16,7 +16,6 @@
  */
 package io.treehouses.remote.ssh.terminal
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
@@ -35,7 +34,6 @@ import kotlin.math.floor
  *
  * @author rhansby
  */
-@TargetApi(11)
 class TerminalTextViewOverlay(context: Context, var terminalView: TerminalView) : AppCompatTextView(context) {
     private var currentSelection = ""
     private var selectionActionMode: ActionMode? = null
@@ -142,7 +140,6 @@ class TerminalTextViewOverlay(context: Context, var terminalView: TerminalView)
         return super.onTouchEvent(event)
     }
 
-    @TargetApi(12)
     override fun onGenericMotionEvent(event: MotionEvent): Boolean {
         if (MotionEventCompat.getSource(event) and InputDevice.SOURCE_CLASS_POINTER != 0) {
             when (event.action) {
@@ -174,10 +171,9 @@ class TerminalTextViewOverlay(context: Context, var terminalView: TerminalView)
      * @param bridge
      * @return True if the event is handled.
      */
-    @TargetApi(14)
     private fun onMouseEvent(event: MotionEvent, bridge: TerminalBridge): Boolean {
-        val row = Math.floor(event.y / bridge.charHeight.toDouble()).toInt()
-        val col = Math.floor(event.x / bridge.charWidth.toDouble()).toInt()
+        val row = floor(event.y / bridge.charHeight.toDouble()).toInt()
+        val col = floor(event.x / bridge.charWidth.toDouble()).toInt()
         val meta = event.metaState
         val shiftOn = meta and KeyEvent.META_SHIFT_ON != 0
         val vtBuffer = bridge.vDUBuffer as vt320
@@ -290,7 +286,6 @@ class TerminalTextViewOverlay(context: Context, var terminalView: TerminalView)
          * @return A Java InputEvent modifier int. See
          * http://docs.oracle.com/javase/7/docs/api/java/awt/event/InputEvent.html
          */
-        @TargetApi(14)
         private fun mouseEventToJavaModifiers(mouseEvent: MotionEvent): Int {
             if (MotionEventCompat.getSource(mouseEvent) != InputDevice.SOURCE_MOUSE) return 0
             var mods = 0
diff --git a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt
index ebbdbfb9d..7f3946cb7 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt
@@ -34,6 +34,7 @@ import io.treehouses.remote.views.terminal.vt320
 import java.io.IOException
 import java.util.regex.Matcher
 import java.util.regex.Pattern
+import kotlin.math.abs
 
 /**
  * User interface [View] for showing a TerminalBridge in an
@@ -83,7 +84,7 @@ class TerminalView(context: Context, bridge: TerminalBridge, pager: TerminalView
                 } else {
                     mEventSender = AccessibilityEventSender()
                 }
-                postDelayed(mEventSender, TerminalView.ACCESSIBILITY_EVENT_THRESHOLD.toLong())
+                postDelayed(mEventSender, ACCESSIBILITY_EVENT_THRESHOLD.toLong())
             }
         }
         (context as Activity).runOnUiThread { terminalTextViewOverlay?.onBufferChanged() }
@@ -289,7 +290,7 @@ class TerminalView(context: Context, bridge: TerminalBridge, pager: TerminalView
     private fun scaleCursors() {
         // Create a scale matrix to scale our 1x1 representation of the cursor
         tempDst[0.0f, 0.0f, bridge.charWidth.toFloat()] = bridge.charHeight.toFloat()
-        scaleMatrix.setRectToRect(tempSrc, tempDst, TerminalView.scaleType)
+        scaleMatrix.setRectToRect(tempSrc, tempDst, scaleType)
     }
 
     companion object {
@@ -316,7 +317,7 @@ class TerminalView(context: Context, bridge: TerminalBridge, pager: TerminalView
             override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
                 // activate consider if within x tolerance
                 val touchSlop = ViewConfiguration.get(this@TerminalView.context).scaledTouchSlop
-                if (Math.abs(e1!!.x - e2.x) < touchSlop * 4) {
+                if (abs(e1!!.x - e2.x) < touchSlop * 4) {
                     // estimate how many rows we have scrolled through
                     // accumulate distance that doesn't trigger immediate scroll
                     totalY += distanceY
diff --git a/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt
index 795cf6d2a..07c932862 100644
--- a/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt
@@ -75,7 +75,7 @@ open class BaseSSHConsole: RootSSHConsole() {
     private fun setConsolePassword(prompt: PromptHelper) {
         bind.consolePasswordGroup.visibility = View.VISIBLE
         val instructions = prompt.promptInstructions
-        if (instructions != null && instructions.isNotEmpty()) {
+        if (!instructions.isNullOrEmpty()) {
             bind.consolePasswordInstructions.visibility = View.VISIBLE
             bind.consolePasswordInstructions.text = instructions
         } else bind.consolePasswordInstructions.visibility = View.GONE
@@ -224,8 +224,7 @@ open class BaseSSHConsole: RootSSHConsole() {
             if (requestedBridge == null) {
                 // If we didn't find the requested connection, try opening it
                 try {
-                    logD("${String.format("We couldnt find an existing bridge with URI=%s (nickname=%s)," +
-                            "so creating one now", requested.toString(), requested!!.fragment)}")
+                    logD(String.format("We couldnt find an existing bridge with URI=%s (nickname=%s)," + "so creating one now", requested.toString(), requested!!.fragment))
                     bound!!.openConnection(requested)
                 } catch (e: Exception) {
                     logE("Problem while trying to create new requested bridge from URI $e")
diff --git a/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt
index 0f12d53f9..eb423a7bd 100644
--- a/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt
@@ -29,18 +29,21 @@ import android.os.Bundle
 import android.os.IBinder
 import android.os.StrictMode
 import android.text.ClipboardManager
-import android.view.*
+import android.view.Menu
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
 import android.widget.HorizontalScrollView
 import androidx.core.view.MenuItemCompat
 import androidx.preference.PreferenceManager
-import io.treehouses.remote.InitialActivity
 import io.treehouses.remote.PreferenceConstants
 import io.treehouses.remote.R
+import io.treehouses.remote.databinding.ActivitySshConsoleBinding
+import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener
 import io.treehouses.remote.ssh.terminal.TerminalBridge
 import io.treehouses.remote.ssh.terminal.TerminalManager
 import io.treehouses.remote.ssh.terminal.TerminalManager.TerminalBinder
-import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener
-import io.treehouses.remote.databinding.ActivitySshConsoleBinding
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE
 
@@ -59,7 +62,7 @@ open class SSHConsole : DerivedSSHConsole(), BridgeDisconnectedListener {
             // If we didn't find the requested connection, try opening it
             if (requestedNickname != null && requestedBridge == null) {
                 try {
-                    logD("${String.format("We couldnt find an existing bridge with URI=%s (nickname=%s), so creating one now", requested.toString(), requestedNickname)}")
+                    logD(String.format("We couldnt find an existing bridge with URI=%s (nickname=%s), so creating one now", requested.toString(), requestedNickname))
                     requestedBridge = bound!!.openConnection(requested)
                 } catch (e: Exception) {
                     logE("Problem while trying to create new requested bridge from URI $e")
@@ -267,7 +270,7 @@ open class SSHConsole : DerivedSSHConsole(), BridgeDisconnectedListener {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        logD("${String.format("onConfigurationChanged; requestedOrientation=%d, newConfig.orientation=%d", requestedOrientation, newConfig.orientation)}")
+        logD(String.format("onConfigurationChanged; requestedOrientation=%d, newConfig.orientation=%d", requestedOrientation, newConfig.orientation))
         if (bound != null) {
             bound!!.isResizeAllowed = !(forcedOrientation &&
                     (newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE &&
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt
index b4da84469..2d77cee75 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt
@@ -55,7 +55,7 @@ class HomeFragment : BaseHomeFragment() {
     private var connectionDialog: ProgressDialog? = null
 
     private lateinit var bind: ActivityHomeFragmentBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityHomeFragmentBinding.inflate(inflater, container, false)
         preferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         setupProfiles()
@@ -76,13 +76,13 @@ class HomeFragment : BaseHomeFragment() {
             }
         }
 
-        viewModel.error.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.error.observe(viewLifecycleOwner) {
             showUpgradeCLI()
-        })
+        }
 
-        viewModel.remoteUpdateRequired.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.remoteUpdateRequired.observe(viewLifecycleOwner) {
             updateTreehousesRemote()
-        })
+        }
 
         observers()
         errorConnecting()
@@ -103,29 +103,36 @@ class HomeFragment : BaseHomeFragment() {
      * Observe different viewModel states to implement changes to the UI
      */
     private fun observers() {
-        viewModel.newCLIUpgradeAvailable.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.newCLIUpgradeAvailable.observe(viewLifecycleOwner) {
             notificationListener?.setNotification(it)
-        })
+        }
 
-        viewModel.internetStatus.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
-            if (it) bind.internetstatus.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.circle_green))
-            else bind.internetstatus.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.circle_red))
-        })
+        viewModel.internetStatus.observe(viewLifecycleOwner) {
+            if (it) {
+                bind.internetstatus.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.circle_green))
+            } else {
+                bind.internetstatus.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.circle_red))
+            }
+        }
 
-        viewModel.testConnectionResult.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
-            if (it.status == Status.SUCCESS) dismissTestConnection()
-        })
+        viewModel.testConnectionResult.observe(viewLifecycleOwner) {
+            if (it.status == Status.SUCCESS) {
+                dismissTestConnection()
+            }
+        }
 
-        viewModel.hashSent.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
-            if (it.status == Status.SUCCESS) syncBluetooth(it.data ?: "error")
-        })
+        viewModel.hashSent.observe(viewLifecycleOwner) {
+            if (it.status == Status.SUCCESS) {
+                syncBluetooth(it.data ?: "error")
+            }
+        }
     }
 
     /**
      * Called when a network configuration status has changed
      */
     private fun observeNetworkProfileSwitch() {
-        viewModel.networkProfileResult.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.networkProfileResult.observe(viewLifecycleOwner, Observer {
             when(it.status) {
                 Status.SUCCESS, Status.ERROR, Status.NOTHING -> {
                     if (progressDialog != null) progressDialog!!.dismiss()
@@ -232,26 +239,28 @@ class HomeFragment : BaseHomeFragment() {
      * @see Constants.STATE_NONE
      */
     private fun observeConnectionState() {
-        viewModel.connectionStatus.observe(viewLifecycleOwner, androidx.lifecycle.Observer {connected ->
+        viewModel.connectionStatus.observe(viewLifecycleOwner) { connected ->
             logE("CONNECTED STATE $connected")
             transition(connected == Constants.STATE_CONNECTED)
             connectionDialog?.dismiss()
-            when(connected) {
+            when (connected) {
                 Constants.STATE_CONNECTED -> {
                     showLogDialog(preferences!!)
                     viewModel.internetSent = true
                     viewModel.sendMessage(getString(R.string.TREEHOUSES_INTERNET))
                     Tutorials.homeTutorials(bind, requireActivity())
                 }
+
                 Constants.STATE_CONNECTING -> {
                     if (viewModel.device != null) showBTConnectionDialog()
                 }
+
                 else -> {
                     viewModel.hashSent.value = Resource.nothing()
                     (activity?.application as MainApplication).logSent = false
                 }
             }
-        })
+        }
         viewModel.loadBT()
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/BaseNetworkViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/BaseNetworkViewModel.kt
index 53fc3232d..66af75e1c 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/BaseNetworkViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/BaseNetworkViewModel.kt
@@ -18,7 +18,7 @@ open class BaseNetworkViewModel(application: Application) : FragmentViewModel(ap
 
     fun bridgeStartConfigListener(stringMap: Map<String, String>) {
         showNetworkProgress.value = true
-        logD(stringMap.getValue("etEssid"));
+        logD(stringMap.getValue("etEssid"))
         sendMessage(getString(R.string.TREEHOUSES_BRIDGE, stringMap.getValue("etEssid"), stringMap.getValue("etHotspotEssid"),
                 stringMap.getValue("etPassword"), stringMap.getValue("etHotspotPassword")))
         Toast.makeText(context, "Connecting...", Toast.LENGTH_LONG).show()
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkFragment.kt
index 3c0c8effe..ec1cceffc 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkFragment.kt
@@ -13,7 +13,6 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import io.treehouses.remote.Constants
 import io.treehouses.remote.R
@@ -30,6 +29,7 @@ import io.treehouses.remote.ui.network.bottomsheetdialogs.EthernetBottomSheet
 import io.treehouses.remote.ui.network.bottomsheetdialogs.HotspotBottomSheet
 import io.treehouses.remote.ui.network.bottomsheetdialogs.WifiBottomSheet
 import io.treehouses.remote.utils.Utils
+
 open class NetworkFragment : BaseFragment(), View.OnClickListener, FragmentDialogInterface {
     private lateinit var binding: ActivityNetworkFragmentBinding
     private lateinit var speedDialog: Dialog
@@ -63,19 +63,20 @@ open class NetworkFragment : BaseFragment(), View.OnClickListener, FragmentDialo
     }
 
     fun loadObservers() {
-        viewModel.networkMode.observe(viewLifecycleOwner, Observer {
+        viewModel.networkMode.observe(viewLifecycleOwner) {
             binding.currentNetworkMode.text = it
-        })
-        viewModel.ipAddress.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.ipAddress.observe(viewLifecycleOwner) {
             binding.networkIP.text = it
-        })
-        viewModel.showNetworkProgress.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.showNetworkProgress.observe(viewLifecycleOwner) {
             binding.networkPbar.visibility = if (it) View.VISIBLE else View.GONE
-        })
-        viewModel.showHome.observe(viewLifecycleOwner, Observer {
-            if (it)
+        }
+        viewModel.showHome.observe(viewLifecycleOwner) {
+            if (it) {
                 listener.openCallFragment(HomeFragment())
-        })
+            }
+        }
     }
 
     private fun showBottomSheet(fragment: BottomSheetDialogFragment, tag: String) {
@@ -135,20 +136,20 @@ open class NetworkFragment : BaseFragment(), View.OnClickListener, FragmentDialo
         speedDialog.setContentView(dialogSpeedtestBinding.root)
         speedDialogDismiss = speedDialog.findViewById(R.id.speedBtnDismiss); speedDialogTest = speedDialog.findViewById(R.id.speedBtnTest)
         speedDialogDismiss.setOnClickListener(this); speedDialogTest.setOnClickListener(this)
-        viewModel.downloadUpload.observe(viewLifecycleOwner, Observer {
+        viewModel.downloadUpload.observe(viewLifecycleOwner) {
             dialogSpeedtestBinding.speedText.text = it
-        })
-        viewModel.dialogCheck.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.dialogCheck.observe(viewLifecycleOwner) {
             speedDialogCheck = it
-        })
+        }
     }
 
     private fun reverseLookup(){
         val dialog  = createRemoteReverseDialog(context)
         dialog!!.show()
-        viewModel.remoteNetworkText.observe(viewLifecycleOwner, Observer {
+        viewModel.remoteNetworkText.observe(viewLifecycleOwner) {
             Utils.setObserverMessage(dialog, it)
-        })
+        }
         viewModel.treehousesRemoteReverse()
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkViewModel.kt
index d98dba480..e4493e7b3 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/NetworkViewModel.kt
@@ -3,18 +3,14 @@ package io.treehouses.remote.ui.network
 import android.app.Application
 import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
-import com.google.gson.Gson
 import io.treehouses.remote.Constants
 import io.treehouses.remote.MainApplication
 import io.treehouses.remote.R
-import io.treehouses.remote.bases.FragmentViewModel
-import io.treehouses.remote.pojo.ReverseData
 import io.treehouses.remote.utils.RESULTS
+import io.treehouses.remote.utils.Utils
 import io.treehouses.remote.utils.logD
 import io.treehouses.remote.utils.logE
 import io.treehouses.remote.utils.match
-import io.treehouses.remote.pojo.NetworkProfile
-import io.treehouses.remote.utils.*
 
 class NetworkViewModel(application: Application) : BaseNetworkViewModel(application) {
     private val context = getApplication<MainApplication>().applicationContext
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/BridgeBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/BridgeBottomSheet.kt
index 58efe941e..2dc9915d4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/BridgeBottomSheet.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/BridgeBottomSheet.kt
@@ -19,7 +19,7 @@ import io.treehouses.remote.ui.network.NetworkViewModel
 class BridgeBottomSheet : BaseBottomSheetDialog() {
     protected val viewModel: NetworkViewModel by viewModels(ownerProducer = { requireParentFragment() })
     private lateinit var bind: DialogBridgeBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogBridgeBinding.inflate(inflater, container, false)
         try {
             bind.etEssid.inputType = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
@@ -47,7 +47,7 @@ class BridgeBottomSheet : BaseBottomSheetDialog() {
 
     private fun getValuesMap(): Map<String, String> {
         return mapOf("etEssid" to bind.etEssid.text.toString(), "etHotspotEssid" to bind.etHotspotEssid.text.toString(),
-                "etPassword" to bind.etPassword.text.toString(), "etHotspotPassword" to bind.etHotspotPassword.text.toString());
+                "etPassword" to bind.etPassword.text.toString(), "etHotspotPassword" to bind.etHotspotPassword.text.toString())
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/EthernetBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/EthernetBottomSheet.kt
index e7d815947..a0a67329b 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/EthernetBottomSheet.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/EthernetBottomSheet.kt
@@ -1,13 +1,10 @@
 package io.treehouses.remote.ui.network.bottomsheetdialogs
 
-import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
-import io.treehouses.remote.ui.network.NetworkFragment
 import io.treehouses.remote.bases.BaseBottomSheetDialog
 import io.treehouses.remote.databinding.DialogEthernetBinding
 import io.treehouses.remote.ui.network.NetworkViewModel
@@ -15,7 +12,7 @@ import io.treehouses.remote.ui.network.NetworkViewModel
 class EthernetBottomSheet : BaseBottomSheetDialog() {
     protected val viewModel: NetworkViewModel by viewModels(ownerProducer = { requireParentFragment() })
     private lateinit var bind: DialogEthernetBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogEthernetBinding.inflate(inflater, container, false)
         bind.btnStartConfig.setOnClickListener {
             viewModel.ethernetStartConfigListener(bind.ip.text.toString(), bind.mask.text.toString(),
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/HotspotBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/HotspotBottomSheet.kt
index 6ee70e8de..70ade3663 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/HotspotBottomSheet.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/HotspotBottomSheet.kt
@@ -12,7 +12,7 @@ import io.treehouses.remote.ui.network.NetworkViewModel
 class HotspotBottomSheet : BaseBottomSheetDialog() {
     protected val viewModel: NetworkViewModel by viewModels(ownerProducer = { requireParentFragment() })
     private lateinit var bind: DialogHotspotBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogHotspotBinding.inflate(inflater, container, false)
         bind.btnStartConfig.setOnClickListener {
             viewModel.hotspotStartConfigListener(bind.etHotspotSsid.text.toString(), bind.etHotspotPassword.text.toString(),
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/WifiBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/WifiBottomSheet.kt
index a9001118a..5dcf11309 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/WifiBottomSheet.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/network/bottomsheetdialogs/WifiBottomSheet.kt
@@ -7,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import io.treehouses.remote.Constants
 import io.treehouses.remote.bases.BaseBottomSheetDialog
 import io.treehouses.remote.databinding.DialogWifiBinding
@@ -19,7 +18,7 @@ import io.treehouses.remote.ui.network.NetworkViewModel
 class WifiBottomSheet : BaseBottomSheetDialog() {
     protected val viewModel: NetworkViewModel by viewModels(ownerProducer = { requireParentFragment() })
     private lateinit var bind: DialogWifiBinding
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogWifiBinding.inflate(inflater, container, false)
         setObservers()
         setClickListeners()
@@ -37,12 +36,12 @@ class WifiBottomSheet : BaseBottomSheetDialog() {
     }
 
     private fun setObservers() {
-        viewModel.wifiUserError.observe(viewLifecycleOwner, Observer {
+        viewModel.wifiUserError.observe(viewLifecycleOwner) {
             bind.wifiUsername.error = if (it) "Please enter a username" else null
-        })
-        viewModel.checkBoxChecked.observe(viewLifecycleOwner, Observer { visible ->
+        }
+        viewModel.checkBoxChecked.observe(viewLifecycleOwner) { visible ->
             bind.enterpriseLayout.visibility = if (visible) View.VISIBLE else View.GONE
-        })
+        }
     }
 
     private fun setClickListeners() {
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesDetailsFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesDetailsFragment.kt
index 49c3b4590..dc6f9e6af 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesDetailsFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesDetailsFragment.kt
@@ -26,17 +26,22 @@ import io.treehouses.remote.utils.logE
 
 class ServicesDetailsFragment : BaseServicesDetailsFragment() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = ActivityServicesDetailsBinding.inflate(inflater, container, false)
 
-        viewModel.servicesData.observe(viewLifecycleOwner, Observer {
+        viewModel.servicesData.observe(viewLifecycleOwner) {
             if (it.status == Status.SUCCESS) {
-                spinnerAdapter = ServicesListAdapter(requireContext(), viewModel.formattedServices, resources.getColor(R.color.md_grey_600))
-                serviceCardAdapter = ServiceCardAdapter(childFragmentManager, viewModel.formattedServices)
+                spinnerAdapter = ServicesListAdapter(
+                    requireContext(),
+                    viewModel.formattedServices,
+                    resources.getColor(R.color.md_grey_600)
+                )
+                serviceCardAdapter =
+                    ServiceCardAdapter(childFragmentManager, viewModel.formattedServices)
                 initialize()
                 goToSelected()
             }
-        })
+        }
         return binding.root
     }
 
@@ -44,17 +49,17 @@ class ServicesDetailsFragment : BaseServicesDetailsFragment() {
         super.onViewCreated(view, savedInstanceState)
         Tutorials.servicesDetailsTutorials(binding, requireActivity())
 
-        viewModel.selectedService.observe(viewLifecycleOwner, Observer { goToSelected() })
+        viewModel.selectedService.observe(viewLifecycleOwner) { goToSelected() }
 
         observeServiceAction()
 
-        viewModel.error.observe(viewLifecycleOwner, Observer {
+        viewModel.error.observe(viewLifecycleOwner) {
             if (!it.isNullOrEmpty()) {
                 Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show()
                 viewModel.error.value = ""
             }
             setScreenState(true)
-        })
+        }
         observeAutoRun()
         observeMoreActions()
     }
@@ -106,19 +111,20 @@ class ServicesDetailsFragment : BaseServicesDetailsFragment() {
      */
     private fun observeMoreActions() {
 
-        viewModel.getLinkAction.observe(viewLifecycleOwner, Observer {
+        viewModel.getLinkAction.observe(viewLifecycleOwner) {
             when (it.status) {
                 Status.SUCCESS -> {
                     openURL(it.data.toString())
                     binding.progressBar.visibility = View.GONE
                     viewModel.getLinkAction.value = Resource.nothing()
                 }
+
                 Status.LOADING -> binding.progressBar.visibility = View.VISIBLE
                 else -> binding.progressBar.visibility = View.GONE
             }
-        })
+        }
 
-        viewModel.editEnvAction.observe(viewLifecycleOwner, Observer {
+        viewModel.editEnvAction.observe(viewLifecycleOwner) {
             if (it.status == Status.SUCCESS) {
                 var tokens = it.data!!
                 val name = tokens[2]
@@ -126,7 +132,7 @@ class ServicesDetailsFragment : BaseServicesDetailsFragment() {
                 showEditDialog(name, tokens.size, tokens)
                 viewModel.editEnvAction.value = Resource.nothing()
             }
-        })
+        }
     }
 
     /**
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesFragment.kt
index 0e86ec5b9..485ffd8e9 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesFragment.kt
@@ -1,7 +1,6 @@
 package io.treehouses.remote.ui.services
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +15,7 @@ import io.treehouses.remote.bases.BaseFragment
 import io.treehouses.remote.databinding.ActivityServicesFragmentBinding
 import io.treehouses.remote.pojo.enum.Status
 import io.treehouses.remote.utils.logE
-import java.util.*
+import java.util.Objects
 
 
 class ServicesFragment : BaseFragment() {
@@ -28,7 +27,7 @@ class ServicesFragment : BaseFragment() {
 
     private val viewModel by viewModels<ServicesViewModel>(ownerProducer = {this})
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityServicesFragmentBinding.inflate(inflater, container, false)
         bind.tabLayout.tabGravity = TabLayout.GRAVITY_FILL
         bind.tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
@@ -50,7 +49,7 @@ class ServicesFragment : BaseFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        viewModel.serverServiceData.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.serverServiceData.observe(viewLifecycleOwner) {
             logE("HERE WITH: $it")
             when (it.status) {
                 Status.LOADING -> bind.progressBar2.visibility = View.VISIBLE
@@ -58,16 +57,17 @@ class ServicesFragment : BaseFragment() {
                     bind.progressBar2.visibility = View.GONE
                     Toast.makeText(requireContext(), it.message, Toast.LENGTH_LONG).show()
                 }
+
                 else -> bind.progressBar2.visibility = View.GONE
             }
-        })
+        }
 
-        viewModel.clickedService.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.clickedService.observe(viewLifecycleOwner) {
             viewModel.selectedService.value = it
             Objects.requireNonNull(bind.tabLayout.getTabAt(1))?.select()
             currentTab = 1
             replaceFragment(currentTab)
-        })
+        }
     }
 
     private fun showUI(){
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesOverviewFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesOverviewFragment.kt
index a98e8ec9c..408c07dc4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesOverviewFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/services/ServicesOverviewFragment.kt
@@ -1,9 +1,6 @@
 package io.treehouses.remote.ui.services
 
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,13 +17,13 @@ import io.treehouses.remote.bases.BaseFragment
 import io.treehouses.remote.databinding.ActivityServicesTabFragmentBinding
 import io.treehouses.remote.pojo.enum.Status
 
-class ServicesOverviewFragment() : BaseFragment(), OnItemClickListener {
+class ServicesOverviewFragment : BaseFragment(), OnItemClickListener {
     private var adapter: ServicesListAdapter? = null
     private lateinit var bind: ActivityServicesTabFragmentBinding
 
     private val viewModel by viewModels<ServicesViewModel>(ownerProducer = {requireParentFragment()})
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityServicesTabFragmentBinding.inflate(inflater, container, false)
         adapter = ServicesListAdapter(requireContext(), viewModel.formattedServices, ContextCompat.getColor(requireContext(), R.color.bg_white))
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksFragment.kt
index d0324881d..23b668887 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksFragment.kt
@@ -7,10 +7,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ListView
+import android.widget.TextView
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import io.treehouses.remote.R
 import io.treehouses.remote.databinding.ActivitySocksFragmentBinding
 import io.treehouses.remote.databinding.DialogAddProfileBinding
@@ -34,7 +39,7 @@ class SocksFragment : Fragment() {
     var bind: ActivitySocksFragmentBinding? = null
     var bindProfile: DialogAddProfileBinding? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivitySocksFragmentBinding.inflate(inflater, container, false)
         bindProfile = DialogAddProfileBinding.inflate(inflater, container, false)
 //        viewModel.onLoad()
@@ -92,30 +97,30 @@ class SocksFragment : Fragment() {
     }
 
     private fun initializeObservers() {
-        viewModel.addProfileButtonText.observe(viewLifecycleOwner, Observer {
-            addingProfileButton?.setText(it)
-        })
+        viewModel.addProfileButtonText.observe(viewLifecycleOwner) {
+            addingProfileButton?.text = it
+        }
     }
 
     private fun messageObservers() {
-        viewModel.textStatusText.observe(viewLifecycleOwner, Observer {
+        viewModel.textStatusText.observe(viewLifecycleOwner) {
             textStatus?.text = it
-        })
+        }
 
 
 
-        viewModel.addProfileButtonText.observe(viewLifecycleOwner, Observer {
+        viewModel.addProfileButtonText.observe(viewLifecycleOwner) {
             addProfileButton?.text = it
-        })
+        }
 
-        viewModel.addProfileButtonEnabled.observe(viewLifecycleOwner, Observer {
+        viewModel.addProfileButtonEnabled.observe(viewLifecycleOwner) {
             addProfileButton?.isEnabled = it
-        })
+        }
 
-        viewModel.refreshList.observe(viewLifecycleOwner, Observer {
+        viewModel.refreshList.observe(viewLifecycleOwner) {
             adapter = ArrayAdapter(requireContext(), R.layout.select_dialog_item, it)
             bind!!.profiles.adapter = adapter
-        })
+        }
     }
 
 
@@ -132,9 +137,11 @@ class SocksFragment : Fragment() {
                     "localAddress" to localAddress.text.toString(), "localPort" to localPort.text.toString(),
                     "serverPort" to serverPort.text.toString(), "password" to password.text.toString())
             viewModel.addProfile(stringMap)
-            viewModel.profileDialogDismiss.observe(viewLifecycleOwner, Observer {
-                if (it) dialog.dismiss()
-            })
+            viewModel.profileDialogDismiss.observe(viewLifecycleOwner) {
+                if (it) {
+                    dialog.dismiss()
+                }
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksViewModel.kt
index 89e6ebcbe..416950dc0 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/socks/SocksViewModel.kt
@@ -6,7 +6,6 @@ import android.widget.Toast.makeText
 import androidx.lifecycle.MutableLiveData
 import io.treehouses.remote.MainApplication.Companion.context
 import io.treehouses.remote.bases.FragmentViewModel
-import io.treehouses.remote.utils.logD
 
 class SocksViewModel(application: Application) : FragmentViewModel(application) {
     val addProfileButtonText: MutableLiveData<String> = MutableLiveData()
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelFragment.kt
index 5e0df68f9..501a418fb 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelFragment.kt
@@ -27,7 +27,7 @@ class SSHTunnelFragment : BaseSSHTunnelFragment() {
     lateinit var dialogSshTunnelHostsBinding: DialogSshtunnelHostsBinding
 
     @RequiresApi(Build.VERSION_CODES.N)
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityTunnelSshFragmentBinding.inflate(inflater, container, false)
         viewModel.onCreateView()
         loadObservers1()
@@ -39,17 +39,23 @@ class SSHTunnelFragment : BaseSSHTunnelFragment() {
     }
 
     private fun loadDialogObservers() {
-        viewModel.tunnelSSHKeyDialogData.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
+        viewModel.tunnelSSHKeyDialogData.observe(viewLifecycleOwner) {
             when (it.status) {
                 Status.SUCCESS -> {
                     if (it.data!!.showHandleDifferentKeysDialog) handleDifferentKeys(it.data)
                     if (it.data!!.showHandlePhoneKeySaveDialog)
                         handlePhoneKeySave(it.data)
                     if (it.data!!.showHandlePiKeySaveDialog)
-                        handlePiKeySave(it.data.profile, it.data.storedPublicKey, it.data.storedPrivateKey)
-                } else -> {}
+                        handlePiKeySave(
+                            it.data.profile,
+                            it.data.storedPublicKey,
+                            it.data.storedPrivateKey
+                        )
+                }
+
+                else -> {}
             }
-        })
+        }
     }
 
 
@@ -60,23 +66,23 @@ class SSHTunnelFragment : BaseSSHTunnelFragment() {
     }
 
     fun showDialog(dialog: Dialog) {
-        dialog.window!!.setBackgroundDrawableResource(android.R.color.transparent);
+        dialog.window!!.setBackgroundDrawableResource(android.R.color.transparent)
         dialog.show()
     }
 
     private fun addListeners1() {
         bind.switchNotification.setOnCheckedChangeListener { _, isChecked -> viewModel.switchButton(isChecked) }
-        bind.btnAddPort.setOnClickListener { showDialog(dialogPort) };
+        bind.btnAddPort.setOnClickListener { showDialog(dialogPort) }
         bind.btnAddHosts.setOnClickListener {
             logD("treehouses clicked add host")
             showDialog(dialogHosts) }
-        bind.btnKeys.setOnClickListener { showDialog(dialogKeys) };
+        bind.btnKeys.setOnClickListener { showDialog(dialogKeys) }
         bind.notifyNow.setOnClickListener { viewModel.notifyNow(requireContext()) }
         bind.info.setOnClickListener {
             val builder = AlertDialog.Builder(ContextThemeWrapper(context, R.style.CustomAlertDialogStyle)); builder.setTitle("SSH Help")
-            builder.setMessage(R.string.ssh_info);
-            val dialog = builder.create();
-            dialog.window!!.setBackgroundDrawableResource(android.R.color.transparent); dialog.show();
+            builder.setMessage(R.string.ssh_info)
+            val dialog = builder.create()
+            dialog.window!!.setBackgroundDrawableResource(android.R.color.transparent); dialog.show()
         }
         dialogSshTunnelPortsBinding.btnAddingPort.setOnClickListener { handleAddPort() }
         dialogSshTunnelHostsBinding.btnAddingHost.setOnClickListener {
@@ -171,7 +177,7 @@ class SSHTunnelFragment : BaseSSHTunnelFragment() {
         addPortSyntaxCheck(dialogSshTunnelPortsBinding.ExternalTextInput, dialogSshTunnelPortsBinding.TLexternal)
         addPortSyntaxCheck(dialogSshTunnelPortsBinding.InternalTextInput, dialogSshTunnelPortsBinding.TLinternal)
         viewModel.initializeArrays()
-        val window = dialogPort.window;
+        val window = dialogPort.window
         val windowHost = dialogHosts.window
         window!!.setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         windowHost!!.setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelViewModel.kt
index 0b5ed6545..e24d0acf7 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/sshtunnel/SSHTunnelViewModel.kt
@@ -28,7 +28,7 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
                 tunnelSSHObject.enabledNotifyNow = false
                 tunnelSSHObject.enableAddPort = false
             }
-            s == TUNNEL_SSH_RESULTS.RESULT_ADDED -> sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_NOTICE));
+            s == TUNNEL_SSH_RESULTS.RESULT_ADDED -> sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_NOTICE))
             s == TUNNEL_SSH_RESULTS.RESULT_REMOVED && lastCommand == getString(R.string.TREEHOUSES_SSHTUNNEL_REMOVE_ALL) -> { tunnelSSHObject.portNames!!.clear();tunnelSSHObject.enabledNotifyNow = false; sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_NOTICE)); }
             s == TUNNEL_SSH_RESULTS.RESULT_REMOVED -> handleModifiedList()
             s == TUNNEL_SSH_RESULTS.RESULT_MODIFIED_LIST -> handleModifiedList()
@@ -123,13 +123,13 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
 
     fun handleNewList(readMessage: String) {
         var position = 0
-        tunnelSSHObject.addPortText = "Add Port";
+        tunnelSSHObject.addPortText = "Add Port"
         tunnelSSHObject.addHostText = "Add Host"
         tunnelSSHObject.enableAddPort = true
         tunnelSSHObject.enableAddHost = true
         tunnelSSHObject.enabledNotifyNow = true
         if (tunnelSSHObject.hostNames.size > 0) {
-            tunnelSSHObject.portNames.removeAt(tunnelSSHObject.portNames.size - 1);
+            tunnelSSHObject.portNames.removeAt(tunnelSSHObject.portNames.size - 1)
         }
         val hosts = readMessage.split('\n')
         for (host in hosts) {
@@ -165,7 +165,7 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
             if (storedPrivateKey.isBlank()) storedPrivateKey = "No private key found"
         }
 
-        val strPhonePublicKey: Spanned;
+        val strPhonePublicKey: Spanned
         val strPhonePrivateKey: Spanned
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -176,20 +176,20 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
             strPhonePublicKey = Html.fromHtml("<b>Phone Public Key for ${profile}:</b> <br>$storedPublicKey\n")
             strPhonePrivateKey = Html.fromHtml("<b>Phone Private Key for ${profile}:</b> <br>$storedPrivateKey")
         }
-        tunnelSSHObject.publicKey = strPhonePublicKey;
+        tunnelSSHObject.publicKey = strPhonePublicKey
         tunnelSSHObject.privateKey = strPhonePrivateKey
     }
 
     protected fun handleOnStatus() {
-        tunnelSSHObject.checkSwitchNotification = true;
-        tunnelSSHObject.enableSwitchNotification = true;
+        tunnelSSHObject.checkSwitchNotification = true
+        tunnelSSHObject.enableSwitchNotification = true
         tunnelSSHObject.enabledNotifyNow = true
         initializeArrays()
         sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_PORTS))
     }
 
     protected fun handleOffStatus() {
-        tunnelSSHObject.checkSwitchNotification = false;
+        tunnelSSHObject.checkSwitchNotification = false
         tunnelSSHObject.enableSwitchNotification = true
         tunnelSSHObject.enabledNotifyNow = true
         sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_PORTS))
@@ -197,9 +197,9 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
 
     protected fun handleNoPorts() {
         tunnelSSHObject.enableSSHPort = true
-        tunnelSSHObject.addPortText = "Add Port";
+        tunnelSSHObject.addPortText = "Add Port"
         tunnelSSHObject.addHostText = "Add Host"
-        tunnelSSHObject.enableAddPort = false;
+        tunnelSSHObject.enableAddPort = false
         tunnelSSHObject.enableAddHost = true
         tunnelSSHObject.enabledNotifyNow = false
         Toast.makeText(context, "Add a host", Toast.LENGTH_SHORT).show()
@@ -219,7 +219,7 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
 
     protected fun handleModifiedList() {
         Toast.makeText(context, "Added/Removed. Retrieving port list.", Toast.LENGTH_SHORT).show()
-        tunnelSSHObject.addPortText = "Retrieving...";
+        tunnelSSHObject.addPortText = "Retrieving..."
         tunnelSSHObject.addHostText = "Retrieving..."
         initializeArrays()
         sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_PORTS))
@@ -227,15 +227,15 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
 
     fun deleteHost(position: Int) {
         val parts = tunnelSSHObject.portNames!![position].split(":")[0]
-        sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_REMOVE_HOST, parts));
+        sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_REMOVE_HOST, parts))
         tunnelSSHObject.addHostText = "deleting host ....."
-        tunnelSSHObject.enableSSHPort = false;
+        tunnelSSHObject.enableSSHPort = false
         tunnelSSHObject.enableAddHost = false
         tunnelSSHData.value = Resource.success(tunnelSSHObject)
     }
 
     fun deletePort(position: Int) {
-        var myPos: Int = 0
+        var myPos = 0
 
         for (pos in tunnelSSHObject.hostPosition!!.indices) {
             if (tunnelSSHObject.hostPosition!![pos] > position) {
@@ -245,7 +245,7 @@ open class SSHTunnelViewModel(application: Application) : BaseSSHTunnelViewModel
         }
         if (tunnelSSHObject.hostPosition!!.last() < position)
             myPos = tunnelSSHObject.hostPosition!!.lastIndex
-        val portName = TunnelUtils.getPortName(tunnelSSHObject.portNames, position);
+        val portName = TunnelUtils.getPortName(tunnelSSHObject.portNames, position)
         val formatArgs = portName + " " + tunnelSSHObject.hostNames[myPos].split(":")[0]
         sendMessage(getString(R.string.TREEHOUSES_SSHTUNNEL_REMOVE_PORT, formatArgs)); tunnelSSHObject.addPortText = "deleting port ....."
         tunnelSSHObject.enableSSHPort = false; tunnelSSHObject.enableAddPort = false
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusFragment.kt
index 62bb4786a..628819d2c 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusFragment.kt
@@ -8,11 +8,16 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.ListView
+import android.widget.ProgressBar
+import android.widget.SearchView
+import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
 import io.treehouses.remote.R
 import io.treehouses.remote.Tutorials
 import io.treehouses.remote.bases.BaseFragment
@@ -31,15 +36,15 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
     private lateinit var bind: ActivityStatusFragmentBinding
     private var notificationListener: NotificationCallback? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityStatusFragmentBinding.inflate(inflater, container, false)
         viewModel.onLoad()
         bind.refreshBtn.setOnClickListener { viewModel.refresh() }
         bind.remoteReverseBtn.setOnClickListener{ reverseLookup() }
-        viewModel.countryList.observe(viewLifecycleOwner, Observer {
+        viewModel.countryList.observe(viewLifecycleOwner) {
             val adapter = ArrayAdapter(requireContext(), R.layout.select_dialog_item_countries, it)
             bind.countryDisplay.setOnClickListener { wifiCountry(adapter) }
-        })
+        }
         return bind.root
     }
 
@@ -53,7 +58,7 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
         countryList?.adapter = adapter
         countryList?.isTextFilterEnabled = true
         countryList?.onItemClickListener = AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, p: Int, _: Long ->
-            viewModel.onSelectCountry(countryList!!.getItemAtPosition(p).toString());
+            viewModel.onSelectCountry(countryList!!.getItemAtPosition(p).toString())
             dialog.dismiss()
         }
 
@@ -61,78 +66,81 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
         dialog.show()
     }
     private fun showBar(mutableData: MutableLiveData<Int>, barView: ProgressBar) {
-        mutableData.observe(viewLifecycleOwner, Observer {
+        mutableData.observe(viewLifecycleOwner) {
             ObjectAnimator.ofInt(barView, "progress", it).setDuration(600).start()
-        })
+        }
     }
 
     private fun barItemsObservers() {
-        viewModel.temperature.observe(viewLifecycleOwner, Observer {
+        viewModel.temperature.observe(viewLifecycleOwner) {
             bind.temperature.text = it
-        })
-        viewModel.memory.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.memory.observe(viewLifecycleOwner) {
             bind.memory.text = it
-        })
+        }
         showBar(viewModel.storageBarValue, bind.storageBar)
         showBar(viewModel.memoryBarValue, bind.memoryBar)
-        viewModel.storage.observe(viewLifecycleOwner, Observer {
+        viewModel.storage.observe(viewLifecycleOwner) {
             bind.storage.text = it
-        })
-        viewModel.temperature.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.temperature.observe(viewLifecycleOwner) {
             if (it.toFloatOrNull() != null)
-                ObjectAnimator.ofInt(bind.temperatureBar, "progress", (it.toFloat() / 80 * 100).toInt()).setDuration(600).start()
+                ObjectAnimator.ofInt(bind.temperatureBar, "progress",
+                    (it.toFloat() / 80 * 100).toInt()).setDuration(600).start()
             bind.temperature.text = "$it°C"
-        })
+        }
     }
 
     private fun upgradeBoxObservers() {
-        viewModel.showUpgrade.observe(viewLifecycleOwner, Observer {
+        viewModel.showUpgrade.observe(viewLifecycleOwner) {
             bind.upgrade.visibility = if (it) View.VISIBLE else View.GONE
-            bind.upgradeCheck.setImageDrawable(ContextCompat.getDrawable(requireContext(), if (it) R.drawable.tick_png else R.drawable.tick))
-        })
+            bind.upgradeCheck.setImageDrawable(
+                ContextCompat.getDrawable(requireContext(), if (it) R.drawable.tick_png else R.drawable.tick)
+            )
+        }
 
-        viewModel.upgradeCheckText.observe(viewLifecycleOwner, Observer {
+        viewModel.upgradeCheckText.observe(viewLifecycleOwner) {
             bind.tvUpgradeCheck.text = it
-        })
+        }
     }
 
     private fun rpiDetailObservers() {
-        viewModel.deviceName.observe(viewLifecycleOwner, Observer {
+        viewModel.deviceName.observe(viewLifecycleOwner) {
             bind.tvBluetooth.text = it
-        })
-        viewModel.rpiType.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.rpiType.observe(viewLifecycleOwner) {
             bind.tvRpiType.text = it
-        })
-        viewModel.hostName.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.hostName.observe(viewLifecycleOwner) {
             bind.tvRpiName.text = it
-        })
-        viewModel.imageText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.imageText.observe(viewLifecycleOwner) {
             bind.imageText.text = it
-        })
-        viewModel.remoteVersion.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.remoteVersion.observe(viewLifecycleOwner) {
             bind.remoteVersionText.text = it
-        })
-        viewModel.cpuModelText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.cpuModelText.observe(viewLifecycleOwner) {
             bind.cpuModelText.text = it
-        })
+        }
     }
 
     private fun networkBoxObservers() {
-        viewModel.ssidText.observe(viewLifecycleOwner, Observer {
+        viewModel.ssidText.observe(viewLifecycleOwner) {
             bind.ssidText.text = it
-        })
-        viewModel.ipAddressText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.ipAddressText.observe(viewLifecycleOwner) {
             bind.ipAdrText.text = it
-        })
-        viewModel.deviceAddress.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.deviceAddress.observe(viewLifecycleOwner) {
             bind.deviceAddress.text = it
-        })
-        viewModel.networkModeText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.networkModeText.observe(viewLifecycleOwner) {
             bind.networkModeTitle.text = it
-        })
-        viewModel.countryDisplayText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.countryDisplayText.observe(viewLifecycleOwner) {
             bind.countryDisplay.setText(it)
-        })
+        }
     }
 
     private fun observers() {
@@ -141,18 +149,19 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
         rpiDetailObservers()
         upgradeBoxObservers()
         networkBoxObservers()
-        viewModel.showNotification.observe(viewLifecycleOwner, Observer {
+        viewModel.showNotification.observe(viewLifecycleOwner) {
             notificationListener!!.setNotification(false)
-        })
-        viewModel.isLoading.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.isLoading.observe(viewLifecycleOwner) {
             bind.progressBar.visibility = if (it) View.VISIBLE else View.GONE
             bind.swiperefresh.isRefreshing = it
-        })
-        viewModel.countryDisplayTextEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.countryDisplayTextEnabled.observe(viewLifecycleOwner) {
             bind.countryDisplay.isEnabled = it
-            if (it)
-                bind.countryDisplay.visibility = View.VISIBLE;
-        })
+            if (it) {
+                bind.countryDisplay.visibility = View.VISIBLE
+            }
+        }
     }
 
 
@@ -178,9 +187,9 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         addRefreshListener()
-        viewModel.hostName.observe(viewLifecycleOwner, Observer {
+        viewModel.hostName.observe(viewLifecycleOwner) {
             bind.tvBluetooth.text = it
-        })
+        }
 
         bind.upgrade.setOnClickListener {
             viewModel.upgrade()
@@ -199,9 +208,9 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
                 ContextCompat.getColor(requireContext(), android.R.color.holo_orange_light),
                 ContextCompat.getColor(requireContext(), android.R.color.holo_blue_light),
                 ContextCompat.getColor(requireContext(), android.R.color.holo_green_light))
-        viewModel.showRefresh.observe(viewLifecycleOwner, Observer {
+        viewModel.showRefresh.observe(viewLifecycleOwner) {
             bind.refreshBtn.isEnabled = it
-        })
+        }
     }
 
 
@@ -228,9 +237,9 @@ class StatusFragment : BaseFragment(), FragmentDialogInterface {
     private fun reverseLookup(){
         val a  = createRemoteReverseDialog(context)
         viewModel.treehousesRemoteReverse()
-        viewModel.reverseTextStatus.observe(viewLifecycleOwner, Observer {
+        viewModel.reverseTextStatus.observe(viewLifecycleOwner) {
             a!!.setMessage(it)
-        })
+        }
         a!!.show()
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusViewModel.kt
index ee61a4fa3..5c4f89cee 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/status/StatusViewModel.kt
@@ -1,19 +1,16 @@
 package io.treehouses.remote.ui.status
 
 import android.app.Application
-import android.os.Message
 import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
 import io.treehouses.remote.BuildConfig
-import io.treehouses.remote.Constants
 import io.treehouses.remote.MainApplication
-import io.treehouses.remote.utils.Utils
 import io.treehouses.remote.R
 import io.treehouses.remote.bases.FragmentViewModel
-import io.treehouses.remote.pojo.ReverseData
 import io.treehouses.remote.pojo.StatusData
-import java.util.*
+import io.treehouses.remote.utils.Utils
+import java.util.Locale
 
 class StatusViewModel(application: Application) : FragmentViewModel(application) {
 
@@ -67,7 +64,7 @@ class StatusViewModel(application: Application) : FragmentViewModel(application)
         for (i in countriesCode.indices) {
             countriesName[i] = getCountryName(countriesCode[i])
         }
-        countryList.value = countriesName;
+        countryList.value = countriesName
     }
 
     override fun onRead(output: String) {
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemFragment.kt
index f5d0127b9..cacf8f37c 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemFragment.kt
@@ -13,8 +13,6 @@ import io.treehouses.remote.adapter.SystemListAdapter
 import io.treehouses.remote.bases.BaseFragment
 import io.treehouses.remote.databinding.ActivitySystemFragmentBinding
 import io.treehouses.remote.pojo.NetworkListItem
-import io.treehouses.remote.utils.logD
-import me.toptas.fancyshowcase.FocusShape
 
 class SystemFragment : BaseFragment() {
 
@@ -38,8 +36,8 @@ class SystemFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         Handler().postDelayed({
-            Tutorials.systemTutorials(requireActivity(),adapter.getViews());
-        }, 1000);
+            Tutorials.systemTutorials(requireActivity(),adapter.getViews())
+        }, 1000)
     }
 
     override fun onResume() {
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemViewModel.kt
index a8f86612e..2595b0460 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemViewModel.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/system/SystemViewModel.kt
@@ -13,6 +13,7 @@ import io.treehouses.remote.bases.FragmentViewModel
 import io.treehouses.remote.utils.DialogUtils
 import io.treehouses.remote.utils.logD
 import java.util.*
+import kotlin.math.pow
 
 class SystemViewModel(application: Application) : FragmentViewModel(application) {
 
@@ -96,7 +97,7 @@ class SystemViewModel(application: Application) : FragmentViewModel(application)
             val power = 3 - i
             result += try {
                 val ip = ipAddressInArray[i].toInt()
-                ip * Math.pow(256.0, power.toDouble()).toLong()
+                ip * 256.0.pow(power.toDouble()).toLong()
             } catch (e: NumberFormatException) {
                 return -1
             }
diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/tor/TorFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/tor/TorFragment.kt
index 35ee80c4e..e12a1e3ca 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/tor/TorFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/tor/TorFragment.kt
@@ -3,11 +3,18 @@ package io.treehouses.remote.ui.tor
 import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
-import android.view.*
-import android.widget.*
+import android.view.ContextThemeWrapper
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.AdapterView
 import android.widget.AdapterView.OnItemClickListener
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.ListView
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import com.google.android.material.textfield.TextInputEditText
 import io.treehouses.remote.R
 import io.treehouses.remote.Tutorials
@@ -15,11 +22,7 @@ import io.treehouses.remote.adapter.TunnelPortAdapter
 import io.treehouses.remote.bases.BaseFragment
 import io.treehouses.remote.databinding.ActivityTorFragmentBinding
 import io.treehouses.remote.utils.DialogUtils
-
 import io.treehouses.remote.utils.TunnelUtils
-import io.treehouses.remote.utils.Utils
-import io.treehouses.remote.utils.logE
-import java.util.*
 
 class TorFragment : BaseFragment() {
     private lateinit var bind: ActivityTorFragmentBinding
@@ -28,7 +31,7 @@ class TorFragment : BaseFragment() {
     var adapter: TunnelPortAdapter? = null
     var hostName: String = ""
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = ActivityTorFragmentBinding.inflate(inflater, container, false)
         viewModel.createView()
         loadObservers1()
@@ -76,38 +79,38 @@ class TorFragment : BaseFragment() {
     }
 
     private fun loadObservers1(){
-        viewModel.hostNameText.observe(viewLifecycleOwner, Observer {
+        viewModel.hostNameText.observe(viewLifecycleOwner) {
             hostName = it
-        })
-        viewModel.hostNameVisible.observe(viewLifecycleOwner, Observer {visible ->
+        }
+        viewModel.hostNameVisible.observe(viewLifecycleOwner) { visible ->
             if (!visible) bind.btnHostName.visibility = View.GONE
             else bind.btnHostName.visibility = View.VISIBLE
-        })
-        viewModel.switchNotificationEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.switchNotificationEnabled.observe(viewLifecycleOwner) {
             bind.switchNotification.isEnabled = it
-        })
-        viewModel.switchNotificationCheck.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.switchNotificationCheck.observe(viewLifecycleOwner) {
             bind.switchNotification.isChecked = it
-        })
-        viewModel.torStartEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.torStartEnabled.observe(viewLifecycleOwner) {
             bind.btnTorStart.isEnabled = it
-        })
-        viewModel.torStartText.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.torStartText.observe(viewLifecycleOwner) {
             bind.btnTorStart.text = it
-        })
+        }
     }
 
     private fun loadObservers2() {
-        viewModel.addPortText.observe(viewLifecycleOwner, Observer {
+        viewModel.addPortText.observe(viewLifecycleOwner) {
             bind.btnAddPort.text = it
-        })
-        viewModel.addPortEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.addPortEnabled.observe(viewLifecycleOwner) {
             bind.btnAddPort.isEnabled = it
-        })
-        viewModel.portListEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.portListEnabled.observe(viewLifecycleOwner) {
             bind.portList.isEnabled = it
-        })
-        viewModel.portsNameList.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.portsNameList.observe(viewLifecycleOwner) {
             portsName = it
             adapter = TunnelUtils.getPortAdapter(requireContext(), portsName)
 //            try {
@@ -118,10 +121,10 @@ class TorFragment : BaseFragment() {
 //            }
             val portList = requireView().findViewById<ListView>(R.id.portList)
             portList.adapter = adapter
-        })
-        viewModel.notifyNowEnabled.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.notifyNowEnabled.observe(viewLifecycleOwner) {
             bind.notifyNow.isEnabled = it
-        })
+        }
     }
 
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/GPSService.kt b/app/src/main/kotlin/io/treehouses/remote/utils/GPSService.kt
index 9ea1725f4..a2399b08d 100644
--- a/app/src/main/kotlin/io/treehouses/remote/utils/GPSService.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/utils/GPSService.kt
@@ -12,9 +12,8 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
 import android.os.IBinder
-import androidx.preference.PreferenceManager
-import android.util.Log
 import androidx.core.app.ActivityCompat
+import androidx.preference.PreferenceManager
 
 /**
  * Created by rowsun on 9/28/16.
diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt
index c056a4eac..b07a12c9a 100644
--- a/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt
@@ -77,8 +77,8 @@ object SaveUtils {
         if (getStringList(context, COMMANDS_TITLES_KEY).isEmpty() || getStringList(context, COMMANDS_VALUES_KEY).isEmpty()) {
             val titles = context.resources.getStringArray(R.array.command_titles)
             val commands = context.resources.getStringArray(R.array.commands)
-            saveStringList(context, ArrayList(Arrays.asList(*titles)), COMMANDS_TITLES_KEY)
-            saveStringList(context, ArrayList(Arrays.asList(*commands)), COMMANDS_VALUES_KEY)
+            saveStringList(context, ArrayList(listOf(*titles)), COMMANDS_TITLES_KEY)
+            saveStringList(context, ArrayList(listOf(*commands)), COMMANDS_VALUES_KEY)
         }
     }
 
diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/SettingsUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/SettingsUtils.kt
index 40d48ba4f..0d992a1da 100644
--- a/app/src/main/kotlin/io/treehouses/remote/utils/SettingsUtils.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/utils/SettingsUtils.kt
@@ -1,6 +1,5 @@
 package io.treehouses.remote.utils
 
-import android.util.Log
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.preference.Preference
diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/TunnelUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/TunnelUtils.kt
index 9ea474917..768a2c063 100644
--- a/app/src/main/kotlin/io/treehouses/remote/utils/TunnelUtils.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/utils/TunnelUtils.kt
@@ -5,7 +5,7 @@ import io.treehouses.remote.adapter.TunnelPortAdapter
 import java.util.ArrayList
 
 object TunnelUtils {
-    fun getPortName(portsName: java.util.ArrayList<String>?, position: Int): String {
+    fun getPortName(portsName: ArrayList<String>?, position: Int): String {
         return portsName!![position].split(":".toRegex(), 2).toTypedArray()[0]
     }
     fun getPortAdapter(context: Context, portsName: ArrayList<String>?): TunnelPortAdapter? {
diff --git a/app/src/main/kotlin/io/treehouses/remote/views/RoundedListPreference.kt b/app/src/main/kotlin/io/treehouses/remote/views/RoundedListPreference.kt
index eaa9f8d54..bf693e5d4 100644
--- a/app/src/main/kotlin/io/treehouses/remote/views/RoundedListPreference.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/views/RoundedListPreference.kt
@@ -35,7 +35,7 @@ class RoundedListPreference : ListPreference {
                     dialog.dismiss()
                 }
                 .setNegativeButton(R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() }.create()
-        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT));
+        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
 
         dialog.show()
     }
diff --git a/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt
index b4f4c12bc..85176936b 100644
--- a/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt
@@ -981,13 +981,13 @@ abstract class vt320 @JvmOverloads constructor(width: Int = 80, height: Int = 24
                                 }
                             }
                             if (!mapped && char >= '\u0080' && char <= '\u00ff') {
-                                when (gx[gr.toInt()]) {
+                                when (gx[gr]) {
                                     '0' -> if (char in '\u00df'..'\u00fe') {
                                         char = DECSPECIAL[char - '\u00df']
                                         mapped = true
                                     }
                                     '<', 'A', 'B' -> mapped = true
-                                    else -> debug("Unsupported GR mapping: " + gx[gr.toInt()])
+                                    else -> debug("Unsupported GR mapping: " + gx[gr])
                                 }
                             }
                         }
diff --git a/build.gradle b/build.gradle
index a29211bc4..6e6e33ed3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7f0c3c4d9..7ab0fdea1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Mar 19 10:10:10 UTC 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists