diff --git a/src/lib/base/EventQueue.cpp b/src/lib/base/EventQueue.cpp
index 4c5a4f9d2..0e2f21544 100644
--- a/src/lib/base/EventQueue.cpp
+++ b/src/lib/base/EventQueue.cpp
@@ -69,8 +69,7 @@ int EventQueue::loop()
     getEvent(event);
   }
   int exitCode = s_exitSuccess;
-  auto *exitEvent = dynamic_cast<ExitEventData *>(event.getDataObject());
-  if (exitEvent != nullptr) {
+  if (auto *exitEvent = dynamic_cast<ExitEventData *>(event.getDataObject()); exitEvent != nullptr) {
     exitCode = exitEvent->exitCode();
   }
   return exitCode;
diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp
index f3491dd5e..1a72f4907 100644
--- a/src/lib/common/Settings.cpp
+++ b/src/lib/common/Settings.cpp
@@ -96,8 +96,9 @@ Settings::Settings(QObject *parent) : QObject(parent)
 
 void Settings::upgradeSettings()
 {
-  const auto logValue = m_settings->value(Settings::Log::Level).toString();
-  if (!LogLevel::logLevelOptions().contains(logValue, Qt::CaseInsensitive))
+
+  if (const auto logValue = m_settings->value(Settings::Log::Level).toString();
+      !LogLevel::logLevelOptions().contains(logValue, Qt::CaseInsensitive))
     m_settings->setValue(Settings::Log::Level, defaultValue(Settings::Log::Level));
 
   for (const auto [oldKey, newKey] : m_upgradedMap.asKeyValueRange()) {
diff --git a/src/lib/platform/EiScreen.cpp b/src/lib/platform/EiScreen.cpp
index c6b0facc2..033c5e51e 100644
--- a/src/lib/platform/EiScreen.cpp
+++ b/src/lib/platform/EiScreen.cpp
@@ -69,8 +69,7 @@ EiScreen::EiScreen(bool isPrimary, IEventQueue *events, bool usePortal)
     }
   } else {
     // Note: socket backend does not support reconnections
-    auto rc = ei_setup_backend_socket(m_ei, nullptr);
-    if (rc != 0) {
+    if (auto rc = ei_setup_backend_socket(m_ei, nullptr); rc != 0) {
       LOG_ERR("ei init error: %s", strerror(-rc));
       throw std::runtime_error("failed to init ei context");
     }
diff --git a/src/lib/platform/PortalInputCapture.cpp b/src/lib/platform/PortalInputCapture.cpp
index 9dbd4f856..c5e3f54de 100644
--- a/src/lib/platform/PortalInputCapture.cpp
+++ b/src/lib/platform/PortalInputCapture.cpp
@@ -431,8 +431,7 @@ PortalInputCapture::mapPortalActivationToScreenPosition(guint barrierId, double
   std::int32_t screenH;
   m_screen->getShape(screenX, screenY, screenW, screenH);
 
-  Bounds portalBounds;
-  if (getPortalBounds(portalBounds)) {
+  if (Bounds portalBounds; getPortalBounds(portalBounds)) {
     x = scaleCoordinateBetweenRanges(rawX, portalBounds.left, portalBounds.right, screenX, screenX + screenW - 1);
     y = scaleCoordinateBetweenRanges(rawY, portalBounds.top, portalBounds.bottom, screenY, screenY + screenH - 1);
   } else {
@@ -481,8 +480,9 @@ std::pair<double, double> PortalInputCapture::mapPortalReleasePosition(double x,
 
   auto mappedX = scaleCoordinateBetweenRanges(x, screenLeft, screenRight, portalBounds.left, portalBounds.right);
   auto mappedY = scaleCoordinateBetweenRanges(y, screenTop, screenBottom, portalBounds.top, portalBounds.bottom);
-  BarrierInfo releaseBarrier;
-  if (getClosestReleaseBarrier(x, y, screenLeft, screenTop, screenRight, screenBottom, portalBounds, releaseBarrier)) {
+
+  if (BarrierInfo releaseBarrier;
+      getClosestReleaseBarrier(x, y, screenLeft, screenTop, screenRight, screenBottom, portalBounds, releaseBarrier)) {
     const Bounds releaseBounds = {
         releaseBarrier.x, releaseBarrier.y, releaseBarrier.x + static_cast<gint>(releaseBarrier.width) - 1,
         releaseBarrier.y + static_cast<gint>(releaseBarrier.height) - 1
@@ -706,9 +706,9 @@ void PortalInputCapture::handleActivated(
       auto warpY = static_cast<int>(y);
 
       guint barrierId = 0;
-      const bool hasBarrierId = g_variant_lookup(options, "barrier_id", "u", &barrierId);
 
-      if (hasBarrierId && barrierId > 0) {
+      if (const bool hasBarrierId = g_variant_lookup(options, "barrier_id", "u", &barrierId);
+          hasBarrierId && barrierId > 0) {
         auto [mappedX, mappedY] = mapPortalActivationToScreenPosition(barrierId, x, y);
         warpX = mappedX;
         warpY = mappedY;