This map loop is little hard to detect when reading through the code, maybe save the call off to a variable and then call map on that?