removed map and changed to list comp