Improved codenarc checks, some cleanup