Refactoring starter kit groovy