refactor enquiry validation
Merge pull request #2 from phawk/refactor_enquiry_validation

refactor enquiry validation