Refactoring: Made code more groovy.