Made changes to ensure compliance with CodePro rules.