message refactoring
messages refactoring