GRAILS-8494:Changes to fit to the coding style.