Refactor, extract files
Refactor DisplayMessage