diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 898b2c34f..44b759d5d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -46,4 +46,4 @@ jobs:
         uses: MishaKav/pytest-coverage-comment@v1.1.51
         with:
           pytest-xml-coverage-path: test_result/coverage.xml
-          junitxml-path: test_result/pytest.xml
\ No newline at end of file
+          junitxml-path: test_result/pytest.xml
diff --git a/otaclient/app/boot_control/_grub.py b/otaclient/app/boot_control/_grub.py
index 0ac03eb9e..1c22d8a04 100644
--- a/otaclient/app/boot_control/_grub.py
+++ b/otaclient/app/boot_control/_grub.py
@@ -15,10 +15,10 @@
 
 DEPRECATION WARNING(20231026):     Current mechanism of defining and
 detecting slots is proved to be not robust.     The design expects that
-rootfs device will always be sda, which might not be guaranteed
-as the sdx naming scheme is based on the order of kernel recognizing
-block devices.         If rootfs somehow is not named as sda, the grub
-boot controller will fail to identifiy         the slots and/or finding
+rootfs device will always be sda, which might not be guaranteed as the
+sdx naming scheme is based on the order of kernel recognizing block
+devices.         If rootfs somehow is not named as sda, the grub boot
+controller will fail to identifiy         the slots and/or finding
 corresponding ota-partition files, finally failing the OTA.     Also
 slots are detected by assuming the partition layout, which is less
 robust comparing to         cboot and rpi_boot implementation of boot
diff --git a/otaclient/app/ota_client_stub.py b/otaclient/app/ota_client_stub.py
index c1c20b637..99a99e208 100644
--- a/otaclient/app/ota_client_stub.py
+++ b/otaclient/app/ota_client_stub.py
@@ -614,8 +614,8 @@ def get_polling_waiter(self):
 
         This waiter will wait for <ACTIVE_POLLING_INTERVAL> and then
         return     if there is active OTA in the cluster. Or if the
-        cluster doesn't have active OTA, wait <IDLE_POLLING_INTERVAL>
-        or self.active_ota_update_present is set, return when one of the
+        cluster doesn't have active OTA, wait <IDLE_POLLING_INTERVAL> or
+        self.active_ota_update_present is set, return when one of the
         condition is met.
 
         """
diff --git a/otaclient/app/ota_metadata.py b/otaclient/app/ota_metadata.py
index c2c17b45d..87699eb91 100644
--- a/otaclient/app/ota_metadata.py
+++ b/otaclient/app/ota_metadata.py
@@ -110,8 +110,8 @@ class MetaFile:
 class MetaFieldDescriptor(Generic[FV]):
     """Field descriptor for dataclass _MetadataJWTClaimsLayout.
 
-    This descriptor takes one dict from parsed metadata.jwt, parses
-    and assigns it to each field in _MetadataJWTClaimsLayout.     Check
+    This descriptor takes one dict from parsed metadata.jwt, parses and
+    assigns it to each field in _MetadataJWTClaimsLayout.     Check
     __set__ method's docstring for more details.
 
     """