Refactored - no issues in CodePro