Some ClassI18nalizator.groovy code clean up