refactored contact form