Shortening Enquiry class file size