Simple changes to make code more Groovy