- messages text formatting
- refactorings