Refactored some variables in report.py