buildscript clean up, idiomatic Groovy