refactored: Improving user messages