Revert 45 revert 40 feature/message readability