diff --git a/src/components/Posts/NewCommentForm/NewCommentForm.tsx b/src/components/Posts/NewCommentForm/NewCommentForm.tsx
index 203fda94f..73d982228 100644
--- a/src/components/Posts/NewCommentForm/NewCommentForm.tsx
+++ b/src/components/Posts/NewCommentForm/NewCommentForm.tsx
@@ -8,21 +8,8 @@ interface NewCommentFormProps {
 export const NewCommentForm: React.FC<NewCommentFormProps> = ({
   handleAddComment,
 }) => {
-  const {
-    name,
-    nameError,
-    email,
-    emailError,
-    body,
-    bodyError,
-    isLoading,
-
-    handleChangeName,
-    handleChangeEmail,
-    handleChangeBody,
-    reset,
-    handleSubmit,
-  } = useCommentForm(handleAddComment);
+  const { isLoading, state, reset, handleSubmit, handleChange } =
+    useCommentForm(handleAddComment);
 
   return (
     <form data-cy="NewCommentForm" onSubmit={handleSubmit}>
@@ -35,18 +22,18 @@ export const NewCommentForm: React.FC<NewCommentFormProps> = ({
           <input
             type="text"
             name="name"
-            value={name}
+            value={state.name.value}
+            onChange={handleChange}
             id="comment-author-name"
             placeholder="Name Surname"
-            className={cn('input', { 'is-danger': nameError })}
-            onChange={handleChangeName}
+            className={cn('input', { 'is-danger': state.name.error })}
           />
 
           <span className="icon is-small is-left">
             <i className="fas fa-user" />
           </span>
 
-          {nameError && (
+          {state.name.error && (
             <span
               className="icon is-small is-right has-text-danger"
               data-cy="ErrorIcon"
@@ -56,9 +43,9 @@ export const NewCommentForm: React.FC<NewCommentFormProps> = ({
           )}
         </div>
 
-        {nameError && (
+        {state.name.error && (
           <p className="help is-danger" data-cy="ErrorMessage">
-            {nameError}
+            {state.name.error}
           </p>
         )}
       </div>
@@ -72,18 +59,18 @@ export const NewCommentForm: React.FC<NewCommentFormProps> = ({
           <input
             type="text"
             name="email"
-            value={email}
+            value={state.email.value}
+            onChange={handleChange}
             id="comment-author-email"
             placeholder="email@test.com"
-            className={cn('input', { 'is-danger': emailError })}
-            onChange={handleChangeEmail}
+            className={cn('input', { 'is-danger': state.email.error })}
           />
 
           <span className="icon is-small is-left">
             <i className="fas fa-envelope" />
           </span>
 
-          {emailError && (
+          {state.email.error && (
             <span
               className="icon is-small is-right has-text-danger"
               data-cy="ErrorIcon"
@@ -93,9 +80,9 @@ export const NewCommentForm: React.FC<NewCommentFormProps> = ({
           )}
         </div>
 
-        {emailError && (
+        {state.email.error && (
           <p className="help is-danger" data-cy="ErrorMessage">
-            {emailError}
+            {state.email.error}
           </p>
         )}
       </div>
@@ -109,16 +96,16 @@ export const NewCommentForm: React.FC<NewCommentFormProps> = ({
           <textarea
             id="comment-body"
             name="body"
-            value={body}
+            value={state.body.value}
+            onChange={handleChange}
             placeholder="Type comment here"
-            className={cn('textarea', { 'is-danger': bodyError })}
-            onChange={handleChangeBody}
+            className={cn('textarea', { 'is-danger': state.body.error })}
           />
         </div>
 
-        {bodyError && (
+        {state.body.error && (
           <p className="help is-danger" data-cy="ErrorMessage">
-            {bodyError}
+            {state.body.error}
           </p>
         )}
       </div>
diff --git a/src/hooks/useCommentForm.ts b/src/hooks/useCommentForm.ts
index 162b0f0eb..2f907eaed 100644
--- a/src/hooks/useCommentForm.ts
+++ b/src/hooks/useCommentForm.ts
@@ -8,77 +8,66 @@ import {
 import { PostsContext } from '../context/PostContext';
 import { Comment } from '../types/Comment';
 
+const initialState = {
+  name: { value: '', error: '' },
+  email: { value: '', error: '' },
+  body: { value: '', error: '' },
+};
+
 export const useCommentForm = (
   handleAddComment: (comment: Omit<Comment, 'id'>) => Promise<void>,
 ) => {
   const { selectedPost } = useContext(PostsContext);
 
-  const [name, setName] = useState('');
-  const [email, setEmail] = useState('');
-  const [body, setBody] = useState('');
-  const [nameError, setNameError] = useState('');
-  const [emailError, setEmailError] = useState('');
-  const [bodyError, setBodyError] = useState('');
-  const [isLoading, setLoading] = useState(false);
+  const [state, setState] = useState(initialState);
 
-  const showErrors = () => {
-    if (!name) {
-      setNameError('Name is required');
-    }
-    if (!email) {
-      setEmailError('Email is required');
-    }
-    if (!body) {
-      setBodyError('Enter some text');
-    }
+  const setStateByInputName = (inputName = '', value = '', error = '') => {
+    setState(prevState => ({
+      ...prevState,
+      [inputName]: {
+        error,
+        value,
+      },
+    }));
   };
 
-  const reset = () => {
-    setNameError('');
-    setEmailError('');
-    setBodyError('');
-    setName('');
-    setEmail('');
-    setBody('');
-  };
+  const [isLoading, setLoading] = useState(false);
 
-  const handleChangeName = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => {
-      setName(event.target.value);
+  const handleChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+      const { value, name } = event.target;
 
-      if (nameError) {
-        setNameError('');
-      }
+      setStateByInputName(name, value, '');
     },
-    [nameError],
+    [state],
   );
 
-  const handleChangeEmail = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => {
-      setEmail(event.target.value);
+  const showErrors = () => {
+    const { name, email, body } = state;
 
-      if (emailError) {
-        setEmailError('');
-      }
-    },
-    [emailError],
-  );
+    if (!name.value) {
+      setStateByInputName('name', '', 'Name is required');
+    }
 
-  const handleChangeBody = useCallback(
-    (event: ChangeEvent<HTMLTextAreaElement>) => {
-      setBody(event.target.value);
+    if (!email.value) {
+      setStateByInputName('email', '', 'Email is required');
+    }
 
-      if (bodyError) {
-        setBodyError('');
-      }
-    },
-    [bodyError],
-  );
+    if (!body.value) {
+      setStateByInputName('body', '', 'Enter some text');
+    }
+  };
+
+  const reset = () => {
+    setState(initialState);
+  };
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    const { name, email, body } = state;
+
     event.preventDefault();
 
-    if (!(name && email && body)) {
+    if (!(name.value && email.value && body.value)) {
       showErrors();
 
       return;
@@ -86,31 +75,26 @@ export const useCommentForm = (
 
     setLoading(true);
 
-    handleAddComment({
-      name,
-      email,
-      body,
+    const comment = {
+      name: name.value,
+      email: email.value,
+      body: body.value,
       postId: selectedPost!.id,
-    }).then(() => {
-      setBody('');
+    };
+
+    handleAddComment(comment).then(() => {
+      setStateByInputName('body', '', '');
+
       setLoading(false);
     });
   };
 
   return {
-    name,
-    nameError,
-    email,
-    emailError,
-    body,
-    bodyError,
     isLoading,
+    state,
 
-    handleChangeName,
-    handleChangeEmail,
-    handleChangeBody,
+    handleChange,
     reset,
-    showErrors,
     handleSubmit,
   };
 };