Refactor report for part 1