Application - Refactoring messages