Refactoring/messages/templates