Merge pull request #7119 from neilLasrado/reports

Code Cleanup