Removed map/filter altogether for cleanup in favor of list comprehension