Display message(s) refactoring