diff --git a/kyu_8/remove_string_spaces/__init__.py b/kyu_8/remove_string_spaces/__init__.py
index e69de29bb2d..9539c9e46bb 100644
--- a/kyu_8/remove_string_spaces/__init__.py
+++ b/kyu_8/remove_string_spaces/__init__.py
@@ -0,0 +1 @@
+"""Remove String Spaces."""
diff --git a/kyu_8/remove_string_spaces/remove_string_spaces.py b/kyu_8/remove_string_spaces/remove_string_spaces.py
index 38d0fcd0605..0711227dd0d 100644
--- a/kyu_8/remove_string_spaces/remove_string_spaces.py
+++ b/kyu_8/remove_string_spaces/remove_string_spaces.py
@@ -1,5 +1,6 @@
 """
-Solution for -> Remove String Spaces
+Solution for -> Remove String Spaces.
+
 Created by Egor Kostan.
 GitHub: https://github.com/ikostan
 """
@@ -7,8 +8,8 @@
 
 def no_space(x: str) -> str:
     """
-    Remove the spaces from the string,
-    then return the resultant string.
+    Remove the spaces from the string.
+
     :param x: str
     :return: str
     """
diff --git a/kyu_8/remove_string_spaces/test_remove_string_spaces.py b/kyu_8/remove_string_spaces/test_remove_string_spaces.py
index a2f9bbe5b8b..08a9ab566fc 100644
--- a/kyu_8/remove_string_spaces/test_remove_string_spaces.py
+++ b/kyu_8/remove_string_spaces/test_remove_string_spaces.py
@@ -1,5 +1,6 @@
 """
-Test for -> Remove String Spaces
+Test for -> Remove String Spaces.
+
 Created by Egor Kostan.
 GitHub: https://github.com/ikostan
 """
@@ -28,14 +29,12 @@
     name='Source/Kata')
 # pylint: enable-msg=R0801
 class NoSpaceTestCase(unittest.TestCase):
-    """
-    Testing no_space function
-    """
+    """Testing no_space function."""
 
     def test_something(self):
         """
-        Test that no_space function removes the spaces
-        from the string, then return the resultant string.
+        Test that no_space function with various test dara.
+
         :return:
         """
         # pylint: disable-msg=R0801