comply more closely with codepro audits cgmcandrews

Complies more closely with codrepro audit, a few yellow flags were unable to be removed. 
As an aside can someone check if this passes junit tests, for some reason mine no longer works even on dev-codonbleu