Huge code reformant to take care of lots of CodePro violations