diff --git a/client/src/components/Form.jsx b/client/src/components/Form.jsx
index 9fd94e8..262d621 100644
--- a/client/src/components/Form.jsx
+++ b/client/src/components/Form.jsx
@@ -1,38 +1,19 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Button, TextField, Typography } from '@mui/material';
-import { useForm } from '../contexts/FormContext';
-
-export default function Form({ formik, fields }) {
-    const { setContent } = useForm();
-
-    useEffect(() => {
-        setContent('');
-    }, []);
-
-    function handleChange(event) {
-        if (event.target.id === 'text')
-            setContent(event.target.value);
-    }
 
+export default function Form({ formik, fields, handleChange }) {
     return (
         <form onSubmit={formik.handleSubmit} onChange={handleChange}>
             {fields.map((field) => (
                 <span key={field.id}>
                     <Typography>{field.title}</Typography>
-                    <TextField {...field} fullWidth/>
+                    <TextField {...field} fullWidth />
                 </span>
             ))}
 
-            <Button
-                fullWidth
-                type='submit'
-                variant='contained'
-                color='primary'
-                sx={{ mt: '1vh' }}
-            >
+            <Button fullWidth type='submit' variant='contained' color='primary' sx={{ mt: '1vh' }}>
                 Submit
             </Button>
-            
         </form>
     );
 }
diff --git a/client/src/controllers/FormControllers/FormController.js b/client/src/controllers/FormControllers/FormController.js
index fddf0ef..1950f55 100644
--- a/client/src/controllers/FormControllers/FormController.js
+++ b/client/src/controllers/FormControllers/FormController.js
@@ -1,5 +1,8 @@
+import { useEffect } from 'react';
 import { useFormik } from 'formik';
+
 import { Form } from 'components';
+import { useForm } from 'contexts';
 
 export default function FormController({
     fields,
@@ -8,33 +11,29 @@ export default function FormController({
     validationSchema,
     children,
 }) {
+    const { setContent } = useForm();
+
+    useEffect(() => {
+        setContent('');
+    }, [setContent]);
+
+    const handleChange = (e) => setContent(e.target.value);
+
     const formik = useFormik({
-        initialValues: fields.reduce(
-            (acc, { id }) => ({ ...acc, [id]: '' }),
-            {}
-        ),
+        initialValues: fields.reduce((acc, { id }) => ({ ...acc, [id]: '' }), {}),
         onSubmit,
         validate,
         validateOnChange: false,
         validationSchema,
     });
+    const formikFields = fields.map(({ id, helperText = () => 0, ...field }) => ({
+        id,
+        ...field,
+        error: Boolean(formik.touched[id] && formik.errors[id]),
+        helperText: helperText(formik.values[id]) || (formik.touched[id] && formik.errors[id]),
+        onChange: formik.handleChange,
+        value: formik.values[id],
+    }));
 
-    const formikFields = fields.map(
-        ({ id, helperText = () => 0, ...field }) => ({
-            id,
-            ...field,
-            error: Boolean(formik.touched[id] && formik.errors[id]),
-            helperText:
-                helperText(formik.values[id]) ||
-                (formik.touched[id] && formik.errors[id]),
-            onChange: formik.handleChange,
-            value: formik.values[id],
-        })
-    );
-
-    return Form({
-        formik,
-        fields: formikFields,
-        children,
-    });
+    return <Form {...{ formik, fields: formikFields, children, handleChange }} />;
 }