Removed map in favor of list comprehension