reporting:  Minor changes based on code review comments for REPORT-247