activity report: refactor