Improve organization of methods for Groovy scripts.