Refactoring fixing Messenger