diff --git a/couchbase-lite/src/appleTest/kotlin/kotbase/internal/DelegatedClassTest.kt b/couchbase-lite/src/appleTest/kotlin/kotbase/internal/DelegatedClassTest.kt
index cd6791f64..3a0a5d24c 100755
--- a/couchbase-lite/src/appleTest/kotlin/kotbase/internal/DelegatedClassTest.kt
+++ b/couchbase-lite/src/appleTest/kotlin/kotbase/internal/DelegatedClassTest.kt
@@ -26,22 +26,15 @@ class DelegatedClassTest {
     private class MyNSObject(val value: Int) : NSObject() {
 
         override fun isEqual(`object`: Any?): Boolean {
-            if (`object` === this) {
-                return true
-            }
-            if (`object` is MyNSObject && `object`.value == value) {
-                return true
-            }
-            return false
+            if (`object` === this) return true
+            if (`object` !is MyNSObject) return false
+            return value == `object`.value
         }
 
-        override fun hash(): NSUInteger {
-            return value.convert()
-        }
+        override fun hash(): NSUInteger = value.convert()
 
-        override fun description(): String {
-            return "My value is $value"
-        }
+        override fun description(): String =
+            "My value is $value"
     }
 
     private class MyDelegatedObject(actual: MyNSObject) : DelegatedClass<MyNSObject>(actual)
diff --git a/couchbase-lite/src/jvmCommonTest/kotlin/kotbase/internal/DelegatedClassTest.kt b/couchbase-lite/src/jvmCommonTest/kotlin/kotbase/internal/DelegatedClassTest.kt
index 9934a440f..6f640b462 100644
--- a/couchbase-lite/src/jvmCommonTest/kotlin/kotbase/internal/DelegatedClassTest.kt
+++ b/couchbase-lite/src/jvmCommonTest/kotlin/kotbase/internal/DelegatedClassTest.kt
@@ -23,22 +23,15 @@ class DelegatedClassTest {
     private class MyObject(val value: Int) {
 
         override fun equals(other: Any?): Boolean {
-            if (other === this) {
-                return true
-            }
-            if (other is MyObject && other.value == value) {
-                return true
-            }
-            return false
+            if (other === this) return true
+            if (other !is MyObject) return false
+            return value == other.value
         }
 
-        override fun hashCode(): Int {
-            return value
-        }
+        override fun hashCode(): Int = value
 
-        override fun toString(): String {
-            return "My value is $value"
-        }
+        override fun toString(): String =
+            "My value is $value"
     }
 
     private class MyDelegatedObject(actual: MyObject) : DelegatedClass<MyObject>(actual)