Groovy stylistic changes