diff --git a/build.gradle.kts b/build.gradle.kts
index 5bcdd12..a350f06 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
 
 tasks {
     wrapper {
-        gradleVersion = "8.5"
+        gradleVersion = "8.6"
         distributionType = Wrapper.DistributionType.BIN
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f98b0fe..4d5d74a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 GROUP=com.pnuema.android
-VERSION_NAME=1.4.2
+VERSION_NAME=1.4.3
 
 POM_NAME=Android OBD Library
 POM_ARTIFACT_ID=obd
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc36d14..3893ea9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 #libs
-kotlinx-serialization = "1.5.1"
+kotlinx-serialization = "1.6.2"
 vanniktech-maven-publish = "0.25.3"
 evalex = "3.1.0"
 androidx-startup = "1.1.1"
 
 #plugins
-kotlin= "1.9.21"
-gradlePlugins-agp = "8.2.0"
+kotlin= "1.9.22"
+gradlePlugins-agp = "8.2.2"
 tomlChecker = "0.47.0"
 gradleCacheFix = "3.0"
 dokka = "1.9.10"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85..7101f8e 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/obd/build.gradle.kts b/obd/build.gradle.kts
index 954a951..2d6e25a 100644
--- a/obd/build.gradle.kts
+++ b/obd/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.toml.version.checker)
 }
 
-version = "1.4.2"
+version = "1.4.3"
 group = "com.pnuema.android"
 
 android {
diff --git a/obd/src/main/java/com/pnuema/android/obd/commands/BaseObdCommand.kt b/obd/src/main/java/com/pnuema/android/obd/commands/BaseObdCommand.kt
index fb089e0..79f20d5 100644
--- a/obd/src/main/java/com/pnuema/android/obd/commands/BaseObdCommand.kt
+++ b/obd/src/main/java/com/pnuema/android/obd/commands/BaseObdCommand.kt
@@ -222,9 +222,7 @@ abstract class BaseObdCommand {
      * Gets whether imperial or metric units should be shown
      * @return true if imperial units are used, or false otherwise
      */
-    fun useImperialUnits(): Boolean {
-        return useImperialUnits
-    }
+    fun useImperialUnits(): Boolean = useImperialUnits
 
     /**
      * Sets whether to use imperial units or metric.
diff --git a/obd/src/main/java/com/pnuema/android/obd/enums/ObdModes.kt b/obd/src/main/java/com/pnuema/android/obd/enums/ObdModes.kt
index bc71fca..8396b9b 100644
--- a/obd/src/main/java/com/pnuema/android/obd/enums/ObdModes.kt
+++ b/obd/src/main/java/com/pnuema/android/obd/enums/ObdModes.kt
@@ -71,8 +71,7 @@ enum class ObdModes constructor(val value: Char) {
      */
     MODE_0A('A');
 
-    val intValue: Int
-        get() = parseLong(value.toString(), 16).toInt()
+    val intValue: Int get() = parseLong(value.toString(), 16).toInt()
 
     override fun toString(): String = value.toString()
 }
\ No newline at end of file
diff --git a/obd/src/main/java/com/pnuema/android/obd/statics/PIDUtils.kt b/obd/src/main/java/com/pnuema/android/obd/statics/PIDUtils.kt
index 23eea70..18769f7 100644
--- a/obd/src/main/java/com/pnuema/android/obd/statics/PIDUtils.kt
+++ b/obd/src/main/java/com/pnuema/android/obd/statics/PIDUtils.kt
@@ -17,7 +17,6 @@ import android.util.SparseArray
 import com.pnuema.android.obd.enums.ObdModes
 import com.pnuema.android.obd.models.PID
 import com.pnuema.android.obd.models.PIDS
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import java.io.IOException
 import java.util.*
@@ -41,9 +40,7 @@ object PIDUtils {
      * @throws IOException thrown if IO can not be performed
      */
     @Throws(IOException::class)
-    fun getPidList(mode: ObdModes): List<PID> {
-        return ArrayList(getPidMap(mode)!!.values)
-    }
+    fun getPidList(mode: ObdModes): List<PID> = ArrayList(getPidMap(mode)!!.values)
 
     /**
      * Gets PID object by mode and pid.
@@ -57,19 +54,17 @@ object PIDUtils {
     fun getPid(mode: ObdModes, pid: String): PID? {
         val start = Calendar.getInstance().time
 
-        val pids = getPidMap(mode)
+        getPidMap(mode)?.let { pids ->
+            val p = pids[Integer.parseInt(pid, 16)]
+            p?.let {
+                Log.d(TAG, "Found pid " + it.PID + " in " + (Calendar.getInstance().time.time - start.time).toString() + " ms")
+            }
 
-        if (pids == null) {
+            return p
+        } ?: run {
             Log.d(TAG, "Pids for this mode do not exist.")
             return null
         }
-
-        val p = pids[Integer.parseInt(pid, 16)]
-        if (p != null) {
-            Log.d(TAG, "Found pid " + p.PID + " in " + (Calendar.getInstance().time.time - start.time).toString() + " ms")
-        }
-
-        return p
     }
 
     @Throws(IOException::class,java.lang.IllegalArgumentException::class)
diff --git a/obd/src/main/java/com/pnuema/android/obd/statics/PersistentStorage.kt b/obd/src/main/java/com/pnuema/android/obd/statics/PersistentStorage.kt
index cef1cc6..58f24e8 100644
--- a/obd/src/main/java/com/pnuema/android/obd/statics/PersistentStorage.kt
+++ b/obd/src/main/java/com/pnuema/android/obd/statics/PersistentStorage.kt
@@ -13,7 +13,6 @@
 package com.pnuema.android.obd.statics
 
 import com.pnuema.android.obd.models.PID
-import java.util.*
 
 /**
  * Storage for the persistent pids so they dont have to be retrieved more than once.
@@ -25,21 +24,21 @@ object PersistentStorage {
     private val persistentPidStorage by lazy { HashMap<String, PID>() }
 
     fun addElement(element: PID?) {
-        if (element != null) {
-            persistentPidStorage[formKey(element)] = element
+        element?.let { pid ->
+            persistentPidStorage[formKey(pid)] = pid
         }
     }
 
     fun removeElement(element: PID?) {
-        if (element != null) {
-            persistentPidStorage.remove(formKey(element))
+        element?.let { pid ->
+            persistentPidStorage.remove(formKey(pid))
         }
     }
 
     fun getElement(element: PID?): PID? {
-        return if (element != null) {
-            persistentPidStorage[formKey(element)]
-        } else null
+        return element?.let { pid ->
+            persistentPidStorage[formKey(pid)]
+        }
     }
 
     fun containsPid(element: PID): Boolean {