Refactor messages 50%