List comprehenesion -> map
get ride of hard-coded for loop