Replaced map with for-comprehension for readibility