Avoiding more uses of map for Python 3 compatibility
Remove redundant list comprehensions