for comprehensions: improvements