Refactor contact form