Some polishing for user feedback.