[Refactor] Map function to replace for loop

Created by: sumleo

Use map function to make it more functional programming Some map function reduced the code lines