removed map in favor of list comprehension (also blazing fast) refs #12