Refactor reports

same.