added report_id to owner and did some code cleanup