u/danielw/dm-1395

Creating PR for reviewing DM-1395
I usually try to use list comprehensions because there is a sentiment that they are easier to read (though in general, map is easier for me to read), but in this case I think I had a distaste for the `]]`.