Refactor. Simplify
Fix message status report