Refactor reporters