"Refactor message reporting"