report message refactor