Clean up displaying of messages