removed another 30 codenarc P3 issues and 10 P2 issues