refactoring to groovy way
Merge pull request #1 from welvet/master

refactoring to groovy way