diff --git a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/component/FormattingUtils.kt b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/component/FormattingUtils.kt
index c729992a..8211b330 100644
--- a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/component/FormattingUtils.kt
+++ b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/component/FormattingUtils.kt
@@ -49,8 +49,11 @@ fun formatElapsedTime(
         }
         if (includeSeconds) {
             val seconds = elapsedDuration.seconds % SECONDS_PER_MINUTE
-            if (LocalAmbientState.current.isInteractive) append("%02d".format(seconds))
-            else append("--")
+            if (LocalAmbientState.current.isInteractive) {
+                append("%02d".format(seconds))
+            } else {
+                append("--")
+            }
             withStyle(style = MaterialTheme.typography.labelSmall.toSpanStyle()) {
                 append("s")
             }
diff --git a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseGoalMet.kt b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseGoalMet.kt
index 37669452..3b13343b 100644
--- a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseGoalMet.kt
+++ b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseGoalMet.kt
@@ -15,12 +15,9 @@
  */
 package com.example.exercisesamplecompose.presentation.dialogs
 
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.SportsScore
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.wear.compose.material3.ConfirmationDialog
 import androidx.wear.compose.material3.Icon
diff --git a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/preparing/PreparingViewModel.kt b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/preparing/PreparingViewModel.kt
index cd54a7df..ff24b198 100644
--- a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/preparing/PreparingViewModel.kt
+++ b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/preparing/PreparingViewModel.kt
@@ -84,13 +84,16 @@ constructor(
 
     companion object {
         val permissions = buildList {
-            add(Manifest.permission.BODY_SENSORS)
             add(Manifest.permission.ACCESS_FINE_LOCATION)
             add(Manifest.permission.ACTIVITY_RECOGNITION)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 add(Manifest.permission.POST_NOTIFICATIONS)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA)
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
                 add(HealthPermissions.READ_HEART_RATE)
+            } else {
+                add(Manifest.permission.BODY_SENSORS)
+            }
         }
     }
 }
diff --git a/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt b/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt
index 7e3d7f51..e9698c6b 100644
--- a/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt
+++ b/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt
@@ -68,7 +68,7 @@ class ExerciseScreenTest(
                             ExerciseServiceState()
                         ),
                         exerciseState = ExerciseServiceState()
-                    ),
+                    )
                 )
             }
         }
diff --git a/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt b/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt
index d8169619..53f5eb77 100644
--- a/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt
+++ b/health-services/ExerciseSampleCompose/app/src/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt
@@ -47,7 +47,7 @@ class PreparingExerciseScreenTest(
         }_${device.id}$suffix.png"
 
     @Composable
-   override fun TestScaffold(content: @Composable () -> Unit) {
+    override fun TestScaffold(content: @Composable () -> Unit) {
         CorrectLayout {
             AppScaffold(timeText = {}) {
                 content()
@@ -55,7 +55,6 @@ class PreparingExerciseScreenTest(
         }
     }
 
-
     @Test
     fun preparing() =
         runTest {