Updated Groovy for comprehensions