diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
index 349b961f6c..ae7eec5eba 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
@@ -53,10 +53,10 @@ class ModelChangedArgs(
 /**
  * The arguments passed to the [IModelChangedHandler] handler when subscribed via [Model.subscribe]
  */
-class ModelReplacedArgs<TModel> (
-        /**
-         * The full model in its previous and current state.
-         */
-        val oldModel: TModel,
-        val newModel: TModel,
+class ModelReplacedArgs<TModel>(
+    /**
+     * The full model in its previous and current state.
+     */
+    val oldModel: TModel,
+    val newModel: TModel,
 ) where TModel : Model
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt
index f22874523c..a10a673e3c 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt
@@ -13,4 +13,4 @@ interface IUserStateObserver {
      * @param state The user changed state.
      */
     fun onUserStateChange(state: UserChangedState)
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt
index 0b99e55f9c..749243cd44 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt
@@ -5,25 +5,24 @@ import org.json.JSONObject
 /**
  * A user state.
  */
-class UserState (
-        /**
-         * The unique identifier for your OneSignal account. This will be a null string until the
-         * user has been successfully logged in on the backend and assigned an ID.
-         * Use [addObserver] to be notified when the [onesignalId] has been successfully assigned.
-         */
-        val onesignalId: String?,
-
-        /**
-         * The external identifier that you use to identify users. This will be an null string
-         * until the user has been successfully logged in on the backend and
-         * assigned an ID.  Use [addObserver] to be notified when the [externalId] has
-         * been successfully assigned.
-         */
-        val externalId: String?,
+class UserState(
+    /**
+     * The unique identifier for your OneSignal account. This will be a null string until the
+     * user has been successfully logged in on the backend and assigned an ID.
+     * Use [addObserver] to be notified when the [onesignalId] has been successfully assigned.
+     */
+    val onesignalId: String?,
+    /**
+     * The external identifier that you use to identify users. This will be an null string
+     * until the user has been successfully logged in on the backend and
+     * assigned an ID.  Use [addObserver] to be notified when the [externalId] has
+     * been successfully assigned.
+     */
+    val externalId: String?,
 ) {
     fun toJSONObject(): JSONObject {
         return JSONObject()
-                .put("onesignalId", onesignalId)
-                .put("externalId", externalId)
+            .put("onesignalId", onesignalId)
+            .put("externalId", externalId)
     }
 }
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
index 7403f35232..1fcd18bde1 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
@@ -1,7 +1,5 @@
 package com.onesignal.user.internal
 
-import android.os.Debug
-import android.util.Log
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.common.events.EventProducer
 import com.onesignal.common.modeling.ISingletonModelStoreChangeHandler
@@ -235,9 +233,14 @@ internal open class UserManager(
         return _propertiesModel.tags.toMap()
     }
 
-    override fun addObserver(observer: IUserStateObserver) = changeHandlersNotifier.subscribe(observer)
+    override fun addObserver(observer: IUserStateObserver) {
+        changeHandlersNotifier.subscribe(observer)
+    }
+
+    override fun removeObserver(observer: IUserStateObserver) {
+        changeHandlersNotifier.unsubscribe(observer)
+    }
 
-    override fun removeObserver(observer: IUserStateObserver) = changeHandlersNotifier.unsubscribe(observer)
     override fun onModelReplaced(model: ModelReplacedArgs<IdentityModel>, tag: String) {
         val oldUserState = UserState(model.oldModel.onesignalId, model.oldModel.externalId)
         val newUserState = UserState(model.newModel.onesignalId, model.newModel.externalId)