CodePro refactoring.