Updaed with CodeNarc (groovy coding convention & findBugs tool) fixes