Made a bunch of CodePro fixes