Removed redundant list comprehensions