Fix code pro audits

Fixed 16 code pro violations. pelynch