@@ -22,10 +22,7 @@ import io.sentry.protocol.TransactionNameSource
 import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion
 import java.lang.ref.WeakReference
 
-private const val BACKSTACK_KEY = "backstack"
-private const val NAVIGATION_CONTEXT_KEY = "navigation"
 private const val NAVIGATION_OP: String = "navigation"
-private const val TRANSACTION_ORIGIN = "auto.navigation.nav3"
 
 /**
  * Observes the back stack managed by a single [SentryNavEffect] and records Sentry state as the
@@ -61,7 +58,7 @@ internal class BackStackObserver<T : Any>(
 
   private val routeTranslator = RouteTranslator(extractors, scopes.options.logger)
 
-  private val navTransaction = NavTransaction(scopes, NAVIGATION_OP, TRANSACTION_ORIGIN)
+  private val navTransaction = NavTransaction(scopes)
   private val navContext = NavContext(scopes, options)
   private val navScreen = NavScreen()
   private val navBreadcrumbs = NavBreadcrumbs(scopes)
@@ -282,11 +279,11 @@ private data class BackStackData<T>(
 )
 
 /** A helper class for managing nav transactions. */
-private class NavTransaction(
-  private val scopes: IScopes,
-  private val navigationOp: String,
-  private val transactionOrigin: String,
-) {
+private class NavTransaction(private val scopes: IScopes) {
+
+  private companion object {
+    private const val TRANSACTION_ORIGIN = "auto.navigation.nav3"
+  }
 
   private var activeNavTransaction: ITransaction? = null
 
@@ -296,7 +293,7 @@ private class NavTransaction(
     name: String,
     arguments: Map<String, Any?>,
   ): ITransaction? {
-    clearFinishedTransaction(scope)
+    clearTransactionIfFinished(scope)
 
     if (scope.transaction != null) {
       scopes.options.logger.log(
@@ -315,12 +312,12 @@ private class NavTransaction(
         val deadlineTimeoutMillis = scopes.options.deadlineTimeout
         it.deadlineTimeout = if (deadlineTimeoutMillis <= 0) null else deadlineTimeoutMillis
         it.isTrimEnd = true
-        it.origin = transactionOrigin
+        it.origin = TRANSACTION_ORIGIN
       }
 
     val transaction =
       scopes.startTransaction(
-        TransactionContext(name, TransactionNameSource.ROUTE, navigationOp),
+        TransactionContext(name, TransactionNameSource.ROUTE, NAVIGATION_OP),
         transactionOptions,
       )
 
@@ -357,7 +354,7 @@ private class NavTransaction(
   }
 
   /** Clears a stale finished transaction that's still bound to the default scope. */
-  private fun clearFinishedTransaction(scope: IScope) {
+  private fun clearTransactionIfFinished(scope: IScope) {
     scope.withTransaction { tx ->
       if (tx?.isFinished == true) {
         scope.clearTransaction()
@@ -369,6 +366,11 @@ private class NavTransaction(
 /** A helper class for updating [nav context][NAVIGATION_CONTEXT_KEY]. */
 private class NavContext(private val scopes: IScopes, private val options: SentryNavOptions) {
 
+  private companion object {
+    private const val BACKSTACK_KEY = "backstack"
+    private const val NAVIGATION_CONTEXT_KEY = "navigation"
+  }
+
   fun update(scope: IScope, backStackRoutes: List<Route>) {
     if (backStackRoutes.isEmpty()) {
       clear(scope)
@@ -379,7 +381,9 @@ private class NavContext(private val scopes: IScopes, private val options: Sentr
   }
 
   fun clear(scope: IScope) {
-    removeNavContext(scope)
+    // We purposefully don't call IScope.removeContexts(), as it doesn't notify IScopeObserver and
+    // therefore doesn't write its updates to disk ¯\_ (ツ)_/¯.
+    scope.setContexts(NAVIGATION_CONTEXT_KEY, null as Any?)
   }
 
   /**
@@ -409,12 +413,6 @@ private class NavContext(private val scopes: IScopes, private val options: Sentr
     }
   }
 
-  private fun removeNavContext(scope: IScope) {
-    // We purposefully don't call IScope.removeContexts(), as it doesn't notify IScopeObserver and
-    // therefore doesn't write its updates to disk ¯\_ (ツ)_/¯.
-    scope.setContexts(NAVIGATION_CONTEXT_KEY, null as Any?)
-  }
-
   /** Builds the `{"backstack": [...]}` map bound under [NAVIGATION_CONTEXT_KEY]. */
   private fun List<Route>.toBackStackMap(): Map<String, Any?> = mapOf(BACKSTACK_KEY to serialize())
 }
@@ -468,6 +466,7 @@ private class NavBreadcrumbs(private val scopes: IScopes) {
 
     val hint = Hint()
     hint.set(TypeCheckHint.ANDROID_NAV3_DESTINATION, toEntry)
+
     scopes.addBreadcrumb(breadcrumb, hint)
   }
 }