Refactor contact forms to client