diff --git a/es-app/src/MiximageGenerator.cpp b/es-app/src/MiximageGenerator.cpp
index aca92d406..cf4948257 100644
--- a/es-app/src/MiximageGenerator.cpp
+++ b/es-app/src/MiximageGenerator.cpp
@@ -99,12 +99,11 @@ void MiximageGenerator::startThread(std::promise<bool>* miximagePromise)
         return;
     }
     else {
-        const auto endTime = std::chrono::system_clock::now();
-
-        LOG(LogDebug)
-            << "MiximageGenerator::MiximageGenerator(): Processing completed in: "
-            << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count()
-            << " ms";
+        LOG(LogDebug) << "MiximageGenerator::MiximageGenerator(): Processing completed in: "
+                      << std::chrono::duration_cast<std::chrono::milliseconds>(
+                             std::chrono::system_clock::now() - startTime)
+                             .count()
+                      << " ms";
     }
 
     mResultMessage = mMessage;
diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index fc1430bf1..e6d19a34a 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -627,11 +627,10 @@ int main(int argc, char* argv[])
     SDL_GameControllerEventState(SDL_ENABLE);
 
     int lastTime = SDL_GetTicks();
-    const auto applicationEndTime = std::chrono::system_clock::now();
 
     LOG(LogInfo) << "Application startup time: "
-                 << std::chrono::duration_cast<std::chrono::milliseconds>(applicationEndTime -
-                                                                          applicationStartTime)
+                 << std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::system_clock::now() - applicationStartTime)
                         .count()
                  << " ms";
 
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 7418d180f..f7679096f 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -510,10 +510,9 @@ void Window::render()
                 mCachedBackground = true;
 
 #if (CLOCK_BACKGROUND_CREATION)
-                const auto backgroundEndTime = std::chrono::system_clock::now();
                 LOG(LogDebug) << "Window::render(): Time to create cached background: "
                               << std::chrono::duration_cast<std::chrono::milliseconds>(
-                                     backgroundEndTime - backgroundStartTime)
+                                     std::chrono::system_clock::now() - backgroundStartTime)
                                      .count()
                               << " ms";
 #endif
diff --git a/es-core/src/renderers/Renderer_GL21.cpp b/es-core/src/renderers/Renderer_GL21.cpp
index ca6da6496..95de8e15a 100644
--- a/es-core/src/renderers/Renderer_GL21.cpp
+++ b/es-core/src/renderers/Renderer_GL21.cpp
@@ -438,10 +438,10 @@ namespace Renderer
         // application functioning normally.
         const auto beforeSwap = std::chrono::system_clock::now();
         SDL_GL_SwapWindow(getSDLWindow());
-        const auto afterSwap = std::chrono::system_clock::now();
 
-        if (std::chrono::duration_cast<std::chrono::milliseconds>(afterSwap - beforeSwap).count() <
-            3.0)
+        if (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() -
+                                                                  beforeSwap)
+                .count() < 3.0)
             SDL_Delay(10);
 #else
         SDL_GL_SwapWindow(getSDLWindow());