Removed unnecessary list comprehensions by combining them