refactor enquiry validation