Upgrade to codenarc 0.20 and some clean code