diff --git a/components/insa/src/ui/ScreenSaver.cpp b/components/insa/src/ui/ScreenSaver.cpp
index 859f8a1..aeca286 100644
--- a/components/insa/src/ui/ScreenSaver.cpp
+++ b/components/insa/src/ui/ScreenSaver.cpp
@@ -121,7 +121,7 @@ void ScreenSaver::trySpawnVehicle()
     newVehicle.direction = direction;
     newVehicle.speed = MIN_SPEED + (static_cast<float>(random()) / RAND_MAX) * (MAX_SPEED - MIN_SPEED);
 
-    // Set Y position based on direction (simulate opposing traffic lanes)
+    // Set Y position based on a direction (simulate opposing traffic lanes)
     const int halfHeight = u8g2->height / 2;
     if (direction == Direction::RIGHT)
     {
@@ -136,7 +136,7 @@ void ScreenSaver::trySpawnVehicle()
         m_leftVehicleCount++;
     }
 
-    // Set starting X position based on direction
+    // Set the starting X position based on the direction
     if (direction == Direction::LEFT)
     {
         // Vehicles going LEFT (from right to left) start from RIGHT side of screen
@@ -145,7 +145,7 @@ void ScreenSaver::trySpawnVehicle()
     else // Direction::RIGHT
     {
         // Vehicles going RIGHT (from left to right) start from LEFT side of screen
-        newVehicle.x = -32; // Account for largest vehicle width
+        newVehicle.x = -32; // Account for the largest vehicle width
     }
 
     newVehicle.active = true;
@@ -186,7 +186,7 @@ void ScreenSaver::render()
     // Calculate offsets
     const int roadOffset = (m_animationCounter / 100) % road_horizontal_width;
     
-    // Draw all active vehicles with scene offset
+    // Draw all active vehicles with a scene offset
     for (const auto &vehicle : m_vehicles)
     {
         if (vehicle.active)
diff --git a/src/ui/Device.cpp b/src/ui/Device.cpp
index 8b09e17..73f374f 100644
--- a/src/ui/Device.cpp
+++ b/src/ui/Device.cpp
@@ -88,7 +88,7 @@ Device::Device(void *appstate) : UIWidget(appstate)
     options.persistenceManager->Load();
 
     m_widget = std::make_shared<SplashScreen>(&options);
-    m_inactivityTracker = std::make_unique<InactivityTracker>(6000, []() {
+    m_inactivityTracker = std::make_unique<InactivityTracker>(60000, []() {
         const auto screensaver = std::make_shared<ScreenSaver>(&options);
         options.pushScreen(screensaver);
     });