Reporting code cleaning
Report code cleaning