refactor report

refactor report