[refactor all] refactoring message