Refactored validation messages
refactored x2