diff --git a/aster_core/physical_device.cpp b/aster_core/physical_device.cpp
index 2d63078..80eb6d4 100644
--- a/aster_core/physical_device.cpp
+++ b/aster_core/physical_device.cpp
@@ -11,17 +11,12 @@ QueueFamilyIndices PhysicalDevice::get_queue_families(const Window *_window, con
 	auto queue_families_ = _device->getQueueFamilyProperties();
 
 	u32 family_index = 0;
-	for (const auto &queueFamily : queue_families_) {
+	for (const auto &queue_family : queue_families_) {
 		u32 this_family_count = 0;
-		VERBOSE(std::fmt("Queue(%i): %s", family_index, to_string(queueFamily.queueFlags).data()));
+		VERBOSE(std::fmt("Queue(%i): %s", family_index, to_string(queue_family.queueFlags).data()));
 
-		if (queueFamily.queueCount <= 0) {
-			++family_index;
-			continue; // Skip families with no queues
-		}
-
-		if (!indices.has_graphics() && (queueFamily.queueFlags & vk::QueueFlagBits::eGraphics)) {
-			if (queueFamily.queueCount > this_family_count) {
+		if (!indices.has_graphics() && (queue_family.queueFlags & vk::QueueFlagBits::eGraphics)) {
+			if (queue_family.queueCount > this_family_count) {
 				indices.graphics_idx = family_index;
 				++this_family_count;
 			} else {
@@ -29,8 +24,8 @@ QueueFamilyIndices PhysicalDevice::get_queue_families(const Window *_window, con
 			}
 		}
 
-		if (!indices.has_compute() && (queueFamily.queueFlags & vk::QueueFlagBits::eCompute)) {
-			if (queueFamily.queueCount > this_family_count) {
+		if (!indices.has_compute() && (queue_family.queueFlags & vk::QueueFlagBits::eCompute)) {
+			if (queue_family.queueCount > this_family_count) {
 				indices.compute_idx = family_index;
 				++this_family_count;
 			} else {
@@ -38,8 +33,8 @@ QueueFamilyIndices PhysicalDevice::get_queue_families(const Window *_window, con
 			}
 		}
 
-		if (!indices.has_transfer() && (queueFamily.queueFlags & vk::QueueFlagBits::eTransfer)) {
-			if (queueFamily.queueCount > this_family_count) {
+		if (!indices.has_transfer() && (queue_family.queueFlags & vk::QueueFlagBits::eTransfer)) {
+			if (queue_family.queueCount > this_family_count) {
 				indices.transfer_idx = family_index;
 				++this_family_count;
 			} else {
@@ -49,7 +44,7 @@ QueueFamilyIndices PhysicalDevice::get_queue_families(const Window *_window, con
 
 		try {
 			if (!indices.has_present() && _device->getSurfaceSupportKHR(family_index, *_window->surface)) {
-				if (queueFamily.queueCount > this_family_count) {
+				if (queue_family.queueCount > this_family_count) {
 					indices.present_idx = family_index;
 					++this_family_count;
 				} else {