diff --git a/src/google/adk/agents/parallel_agent.py b/src/google/adk/agents/parallel_agent.py
index cbbb0333..f7270a75 100644
--- a/src/google/adk/agents/parallel_agent.py
+++ b/src/google/adk/agents/parallel_agent.py
@@ -160,7 +160,7 @@ async def _merge_agent_run(
 
 
 class ParallelAgent(BaseAgent):
-  """A shell agent that run its sub-agents in parallel in isolated manner.
+  """A shell agent that runs its sub-agents in parallel in an isolated manner.
 
   This approach is beneficial for scenarios requiring multiple perspectives or
   attempts on a single task, such as:
diff --git a/src/google/adk/evaluation/base_eval_service.py b/src/google/adk/evaluation/base_eval_service.py
index a82a4683..bb1c3b23 100644
--- a/src/google/adk/evaluation/base_eval_service.py
+++ b/src/google/adk/evaluation/base_eval_service.py
@@ -31,7 +31,7 @@ from .eval_result import EvalCaseResult
 
 
 class EvaluateConfig(BaseModel):
-  """Contains configurations need to run an evaluations."""
+  """Contains configurations needed to run evaluations."""
 
   model_config = ConfigDict(
       alias_generator=alias_generators.to_camel,
diff --git a/src/google/adk/evaluation/eval_sets_manager.py b/src/google/adk/evaluation/eval_sets_manager.py
index be4655e4..94ca1476 100644
--- a/src/google/adk/evaluation/eval_sets_manager.py
+++ b/src/google/adk/evaluation/eval_sets_manager.py
@@ -23,7 +23,7 @@ from .eval_set import EvalSet
 
 
 class EvalSetsManager(ABC):
-  """An interface to manage an Eval Sets."""
+  """An interface to manage Eval Sets."""
 
   @abstractmethod
   def get_eval_set(self, app_name: str, eval_set_id: str) -> Optional[EvalSet]:
diff --git a/src/google/adk/flows/llm_flows/functions.py b/src/google/adk/flows/llm_flows/functions.py
index 95d1e790..c5d2eea9 100644
--- a/src/google/adk/flows/llm_flows/functions.py
+++ b/src/google/adk/flows/llm_flows/functions.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Handles function callings for LLM flow."""
+"""Handles function calling for LLM flow."""
 
 from __future__ import annotations
 
diff --git a/src/google/adk/sessions/state.py b/src/google/adk/sessions/state.py
index 86eb673a..e56f33ce 100644
--- a/src/google/adk/sessions/state.py
+++ b/src/google/adk/sessions/state.py
@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any
 
 
 class State:
-  """A state dict that maintain the current value and the pending-commit delta."""
+  """A state dict that maintains the current value and the pending-commit delta."""
 
   APP_PREFIX = "app:"
   USER_PREFIX = "user:"
diff --git a/src/google/adk/telemetry/tracing.py b/src/google/adk/telemetry/tracing.py
index 1c5cd792..bda9fd0b 100644
--- a/src/google/adk/telemetry/tracing.py
+++ b/src/google/adk/telemetry/tracing.py
@@ -86,7 +86,7 @@ def _safe_json_serialize(obj) -> str:
 def trace_agent_invocation(
     span: trace.Span, agent: BaseAgent, ctx: InvocationContext
 ) -> None:
-  """Sets span attributes immedietely available on agent invocation according to OTEL semconv version 1.37.
+  """Sets span attributes immediately available on agent invocation according to OTEL semconv version 1.37.
 
   Args:
     span: Span on which attributes are set.
diff --git a/tests/unittests/runners/test_pause_invocation.py b/tests/unittests/runners/test_pause_invocation.py
index f0c43f07..79a42c19 100644
--- a/tests/unittests/runners/test_pause_invocation.py
+++ b/tests/unittests/runners/test_pause_invocation.py
@@ -469,7 +469,7 @@ class TestPauseInvocationWithLlmAgentTree(BasePauseInvocationTest):
 
 
 class TestPauseInvocationWithWithTransferLoop(BasePauseInvocationTest):
-  """Tests the pausing the invocation when the agent transfer forms a loop."""
+  """Tests pausing the invocation when the agent transfer forms a loop."""
 
   @pytest.fixture
   def agent(self) -> LlmAgent: