refactored for loop to map

Created by: smhaggerty

Just a small refactoring to improve readability and take advantage of newer ES6 arrow function syntax.