diff --git a/openmc/filter.py b/openmc/filter.py
index 2a36a66e05..c1b9f8dc92 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -570,7 +570,7 @@ class SurfaceFilter(WithIDFilter):
     Parameters
     ----------
     bins : openmc.Surface, int, or iterable of Integral
-        The surfaces to tally over. Either openmc.Surface objects of their ID
+        The surfaces to tally over. Either openmc.Surface objects or their ID
         numbers can be used.
     filter_id : int
         Unique identifier for the filter
@@ -578,7 +578,7 @@ class SurfaceFilter(WithIDFilter):
     Attributes
     ----------
     bins : Iterable of Integral
-        The surfaces to tally over. Either openmc.Surface objects of their ID
+        The surfaces to tally over. Either openmc.Surface objects or their ID
         numbers can be used.
     id : int
         Unique identifier for the filter
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index a0b077a940..a29bb08e83 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2371,9 +2371,7 @@ contains
 
       ! Allocate according to the filter type
       err = openmc_filter_set_type(i_start + i - 1, to_c_string(temp_str))
-      if (err /= 0) then
-        call fatal_error(to_f_string(openmc_err_msg))
-      end if
+      if (err /= 0) call fatal_error(to_f_string(openmc_err_msg))
 
       ! Read filter data from XML
       call f % obj % from_xml(node_filt)
diff --git a/src/tallies/tally_filter_meshsurface.F90 b/src/tallies/tally_filter_meshsurface.F90
index 1913c8b0de..e1e8c48033 100644
--- a/src/tallies/tally_filter_meshsurface.F90
+++ b/src/tallies/tally_filter_meshsurface.F90
@@ -48,7 +48,7 @@ contains
     n = node_word_count(node, "bins")
 
     if (n /= 1) call fatal_error("Only one mesh can be &
-         &specified per mesh filter.")
+         &specified per meshsurface filter.")
 
     ! Determine id of mesh
     call get_node_value(node, "bins", id)
@@ -297,7 +297,7 @@ contains
 !===============================================================================
 
   function openmc_meshsurface_filter_set_mesh(index, index_mesh) result(err) bind(C)
-    ! Set the mesh for a mesh filter
+    ! Set the mesh for a mesh surface filter
     integer(C_INT32_T), value, intent(in) :: index
     integer(C_INT32_T), value, intent(in) :: index_mesh
     integer(C_INT) :: err