Start to fix medium violations in CodePro