diff --git a/ada_feeding/ada_feeding/helpers.py b/ada_feeding/ada_feeding/helpers.py
index 8735de97..5f474d8c 100644
--- a/ada_feeding/ada_feeding/helpers.py
+++ b/ada_feeding/ada_feeding/helpers.py
@@ -485,5 +485,5 @@ def get_tool_joints(end_effector_tool: str) -> List[str]:
 
     if end_effector_tool in tool_joints:
         return tool_joints[end_effector_tool]
-    else:
-        raise ValueError(f"Unknown end_effector_tool: {end_effector_tool}")
+
+    raise ValueError(f"Unknown end_effector_tool: {end_effector_tool}")
diff --git a/ada_feeding/scripts/create_action_servers.py b/ada_feeding/scripts/create_action_servers.py
index 8cb7eac0..bfdc79f4 100755
--- a/ada_feeding/scripts/create_action_servers.py
+++ b/ada_feeding/scripts/create_action_servers.py
@@ -197,7 +197,7 @@ def read_params(self) -> Tuple[Parameter, Parameter, Dict[str, ActionServerParam
         -------
         action_server_params: A dict mapping server names to ActionServerParams objects.
         """
-        # pylint: disable=too-many-locals
+        # pylint: disable=too-many-locals, too-many-branches
         # Okay because we are providing a lot of generic capabilities through parameters
 
         default_namespace = CreateActionServers.DEFAULT_PARAMETER_NAMESPACE