diff --git a/airgun/entities/subscription.py b/airgun/entities/subscription.py
index 348634538..76c1009ec 100644
--- a/airgun/entities/subscription.py
+++ b/airgun/entities/subscription.py
@@ -48,9 +48,9 @@ def _wait_for_process_to_finish(
     @property
     def has_manifest(self):
         """Is there manifest present in current organization?
-        :return: boolean value indicating whether manifest is present
-        May be None if user can't verify reliably if manifest is
-        uploaded or not due to missing permissions
+
+        :return: boolean value indicating whether manifest is present May be None if user can't verify
+            reliably if manifest is uploaded or not due to missing permissions
         """
         try:
             view = self.navigate_to(self, 'Manage Manifest')
diff --git a/airgun/helpers/base.py b/airgun/helpers/base.py
index e3ce6a73f..8446ec465 100644
--- a/airgun/helpers/base.py
+++ b/airgun/helpers/base.py
@@ -1,22 +1,15 @@
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    pass
-
-
 class BaseEntityHelper:
     def __init__(self, entity):
-        # type: (BaseEntity) -> None
         self._entity = entity
 
     @property
     def entity(self):
+        """Returns the entity associated with this helper."""
         return self._entity
 
     def read_filled_view(
         self, navigation_name, navigation_kwargs=None, values=None, read_widget_names=None
     ):
-        # type: (str, Dict, Dict[str, Any], List[str]) -> Dict[str, Any]
         """Navigate to a form using 'navigation_name' and with parameters from 'navigation_kwargs',
         fill the form with values and then read values for widgets from 'read_widget_names' list if
         supplied otherwise read all widgets values.
@@ -32,10 +25,8 @@ def read_filled_view(
             )
 
         """
-        if navigation_kwargs is None:
-            navigation_kwargs = {}
-        if values is None:
-            values = {}
+        navigation_kwargs = navigation_kwargs or {}
+        values = values or {}
         view = self.entity.navigate_to(self.entity, name=navigation_name, **navigation_kwargs)
         view.fill(values)
         return view.read(widget_names=read_widget_names)
diff --git a/airgun/widgets.py b/airgun/widgets.py
index ba943de9c..b2566ba6e 100644
--- a/airgun/widgets.py
+++ b/airgun/widgets.py
@@ -2370,8 +2370,9 @@ class AuthSourceAggregateCard(AggregateStatusCard):
 
     @property
     def count(self):
-        """Count of sources
-        :return int: None if no count element is found, otherwise count of sources in the card
+        """Count of sources.
+
+        :return int or None: None if no count element is found, otherwise count of sources in the card.
         """
         try:
             return int(self.browser.text(self.browser.element(self.COUNT)))