doing some codenarc cleanup and upgrading to grails 2.1.3