Refactoring @messages