Changed to list comprehension for more readability