removed excessive list() calls on list comprehensions