cleaned up 40 more codenarc P3 issues and 10 P2 issues