Cleaned up final messages