Refactoring stream message