diff --git a/cedar-policy-core/src/ast/policy_set.rs b/cedar-policy-core/src/ast/policy_set.rs
index 40f927ca1..e9db1cb9b 100644
--- a/cedar-policy-core/src/ast/policy_set.rs
+++ b/cedar-policy-core/src/ast/policy_set.rs
@@ -31,13 +31,13 @@ use thiserror::Error;
 pub struct PolicySet {
     /// `templates` contains all bodies of policies in the `PolicySet`
     /// A body is either:
-    ///    A Body of a `Template`, which has slots that need to be filled in
-    ///    A Body of an `StaticPolicy`, which has been converted into a `Template` that has zero slots
-    ///      The static policy's PolicyID is the same in both `templates` and `links`
+    ///    - A Body of a `Template`, which has slots that need to be filled in
+    ///    - A Body of a `StaticPolicy`, which has been converted into a `Template` that has zero slots
+    /// The static policy's [`PolicyID`] is the same in both `templates` and `links`
     templates: HashMap<PolicyID, Arc<Template>>,
     /// `links` contains all of the executable policies in the `PolicySet`
     /// A `StaticPolicy` must have exactly one `Policy` in `links`
-    ///   (this is managed by `PolicySet::add)
+    ///   (this is managed by `PolicySet::add`)
     ///   The static policy's PolicyID is the same in both `templates` and `links`
     /// A `Template` may have zero or many links
     links: HashMap<PolicyID, Policy>,
@@ -296,7 +296,7 @@ impl PolicySet {
     }
 
     /// Add a template to the policy set.
-    /// If a link with the same name already exists, this will error.
+    /// If a link, static policy or template with the same name already exists, this will error.
     pub fn add_template(&mut self, t: Template) -> Result<(), PolicySetError> {
         if self.links.contains_key(t.id()) {
             return Err(PolicySetError::Occupied { id: t.id().clone() });
@@ -318,8 +318,8 @@ impl PolicySet {
     }
 
     /// Remove a template from the policy set.
-    /// If any policy is linked to the template this will error
-    /// If it is not a template this will error.
+    /// This will error if any policy is linked to the template.
+    /// This will error if `policy_id` is not a template.
     pub fn remove_template(
         &mut self,
         policy_id: &PolicyID,
diff --git a/cedar-policy/src/api.rs b/cedar-policy/src/api.rs
index 7b5c784c4..67a18642e 100644
--- a/cedar-policy/src/api.rs
+++ b/cedar-policy/src/api.rs
@@ -1889,8 +1889,9 @@ impl PolicySet {
         }
     }
 
-    /// Remove a static `Policy` from the `PolicySet`
-    /// If the policy is not a static policy this will error
+    /// Remove a static `Policy` from the `PolicySet`.
+    ///
+    /// This will error if the policy is not a static policy.
     pub fn remove_static(&mut self, policy_id: PolicyId) -> Result<Policy, PolicySetError> {
         let Some(policy) = self.policies.remove(&policy_id) else {
             return Err(PolicySetError::PolicyNonexistentError(policy_id));
@@ -1917,8 +1918,9 @@ impl PolicySet {
     }
 
     /// Remove a `Template` from the `PolicySet`.
-    /// If any policy is linked to the template, this will error
-    /// If the policy is not a template this will error
+    ///
+    /// This will error if any policy is linked to the template.
+    /// This will error if `policy_id` is not a template.
     pub fn remove_template(&mut self, template_id: PolicyId) -> Result<Template, PolicySetError> {
         let Some(template) = self.templates.remove(&template_id) else {
             return Err(PolicySetError::TemplateNonexistentError(template_id));
diff --git a/cedar-policy/src/tests.rs b/cedar-policy/src/tests.rs
index 19a054199..57d2046e6 100644
--- a/cedar-policy/src/tests.rs
+++ b/cedar-policy/src/tests.rs
@@ -756,7 +756,6 @@ mod policy_set_tests {
             pset.remove_template(PolicyId::from_str("policy3").unwrap()),
             Err(PolicySetError::TemplateNonexistentError(_))
         );
-        //Should not panic
     }
 
     #[test]