diff --git a/src/windows/win_display_device_general.cpp b/src/windows/win_display_device_general.cpp
index fcfc6ee..8672a79 100644
--- a/src/windows/win_display_device_general.cpp
+++ b/src/windows/win_display_device_general.cpp
@@ -66,21 +66,9 @@ namespace display_device {
           m_w_api->getHdrState(best_path)
         };
 
-        available_devices.push_back(
-          {device_id,
-           display_name,
-           friendly_name,
-           edid,
-           info}
-        );
+        available_devices.emplace_back(device_id, display_name, friendly_name, edid, info);
       } else {
-        available_devices.push_back(
-          {device_id,
-           display_name,
-           friendly_name,
-           edid,
-           std::nullopt}
-        );
+        available_devices.emplace_back(device_id, display_name, friendly_name, edid, std::nullopt);
       }
     }
 
diff --git a/tests/unit/windows/test_win_api_utils.cpp b/tests/unit/windows/test_win_api_utils.cpp
index edfcedd..1cdf5f9 100644
--- a/tests/unit/windows/test_win_api_utils.cpp
+++ b/tests/unit/windows/test_win_api_utils.cpp
@@ -77,11 +77,11 @@ namespace {
     []() {
       std::vector<DISPLAYCONFIG_MODE_INFO> modes;
 
-      modes.push_back({});
+      modes.emplace_back();
       modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_TARGET;
       modes.back().targetMode = {};  // Set the union value
 
-      modes.push_back({});
+      modes.emplace_back();
       modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
       modes.back().sourceMode = {};  // Set the union value
 
@@ -201,8 +201,8 @@ TEST_F_S_MOCKED(GetSourceIndex) {
   std::vector<DISPLAYCONFIG_MODE_INFO> modes;
 
   path.sourceInfo.sourceModeInfoIdx = 1;
-  modes.push_back({});  // Non-empty list
-  modes.push_back({});  // Non-empty list
+  modes.emplace_back();  // Non-empty list
+  modes.emplace_back();  // Non-empty list
 
   EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::make_optional<UINT32>(1));
 }
@@ -212,7 +212,7 @@ TEST_F_S_MOCKED(GetSourceIndex, InvalidIndex) {
   std::vector<DISPLAYCONFIG_MODE_INFO> modes;
 
   path.sourceInfo.sourceModeInfoIdx = DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID;
-  modes.push_back({});  // Non-empty list
+  modes.emplace_back();  // Non-empty list
 
   EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::nullopt);
 }
@@ -222,7 +222,7 @@ TEST_F_S_MOCKED(GetSourceIndex, OutOfRangeIndex) {
   std::vector<DISPLAYCONFIG_MODE_INFO> modes;
 
   path.sourceInfo.sourceModeInfoIdx = 1;
-  modes.push_back({});  // Non-empty list
+  modes.emplace_back();  // Non-empty list
 
   EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::nullopt);
 }
diff --git a/tests/unit/windows/utils/mock_win_api_layer.cpp b/tests/unit/windows/utils/mock_win_api_layer.cpp
index b59cabf..9e0b1c8 100644
--- a/tests/unit/windows/utils/mock_win_api_layer.cpp
+++ b/tests/unit/windows/utils/mock_win_api_layer.cpp
@@ -7,7 +7,7 @@ namespace {
 
     // 1st group (1 device)
     {
-      data.m_paths.push_back({});
+      data.m_paths.emplace_back();
       data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
       data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
       data.m_paths.back().sourceInfo.adapterId = {1, 1};
@@ -15,7 +15,7 @@ namespace {
       data.m_paths.back().targetInfo.targetAvailable = TRUE;
       data.m_paths.back().targetInfo.refreshRate = {120, 1};
 
-      data.m_modes.push_back({});
+      data.m_modes.emplace_back();
       data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
       data.m_modes.back().sourceMode = {};  // Set the union
       data.m_modes.back().sourceMode.position = {0, 0};
@@ -25,7 +25,7 @@ namespace {
 
     // 2nd group (1+ device)
     {
-      data.m_paths.push_back({});
+      data.m_paths.emplace_back();
       data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
       data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
       data.m_paths.back().sourceInfo.adapterId = {2, 2};
@@ -33,7 +33,7 @@ namespace {
       data.m_paths.back().targetInfo.targetAvailable = TRUE;
       data.m_paths.back().targetInfo.refreshRate = {119995, 1000};
 
-      data.m_modes.push_back({});
+      data.m_modes.emplace_back();
       data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
       data.m_modes.back().sourceMode = {};  // Set the union
       data.m_modes.back().sourceMode.position = {1921, 0};
@@ -41,7 +41,7 @@ namespace {
       data.m_modes.back().sourceMode.height = 2160;
 
       if (include_duplicate) {
-        data.m_paths.push_back({});
+        data.m_paths.emplace_back();
         data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
         data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
         data.m_paths.back().sourceInfo.adapterId = {3, 3};
@@ -49,7 +49,7 @@ namespace {
         data.m_paths.back().targetInfo.targetAvailable = TRUE;
         data.m_paths.back().targetInfo.refreshRate = {60, 1};
 
-        data.m_modes.push_back({});
+        data.m_modes.emplace_back();
         data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
         data.m_modes.back().sourceMode = {};  // Set the union
         data.m_modes.back().sourceMode.position = {1921, 0};
@@ -60,7 +60,7 @@ namespace {
 
     // 3rd group (1 device)
     {
-      data.m_paths.push_back({});
+      data.m_paths.emplace_back();
       data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
       data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
       data.m_paths.back().sourceInfo.adapterId = {4, 4};
@@ -68,7 +68,7 @@ namespace {
       data.m_paths.back().targetInfo.targetAvailable = TRUE;
       data.m_paths.back().targetInfo.refreshRate = {90, 1};
 
-      data.m_modes.push_back({});
+      data.m_modes.emplace_back();
       data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
       data.m_modes.back().sourceMode = {};  // Set the union
       data.m_modes.back().sourceMode.position = {0, 1081};