diff --git a/src/rmvs/rmvs_util.f90 b/src/rmvs/rmvs_util.f90
index 379c1d4c0..29d0b7b2a 100644
--- a/src/rmvs/rmvs_util.f90
+++ b/src/rmvs/rmvs_util.f90
@@ -13,7 +13,7 @@ module subroutine rmvs_util_fill_pl(self, inserts, lfill_list)
       class(swiftest_body),  intent(inout) :: inserts    !! Inserted object 
       logical, dimension(:), intent(in)    :: lfill_list !! Logical array of bodies to merge into the keeps
       ! Internals
-      integer(I4B)                                      :: i
+      integer(I4B) :: i
 
       associate(keeps => self)
          select type(inserts)
@@ -39,9 +39,9 @@ module subroutine rmvs_util_fill_tp(self, inserts, lfill_list)
       !! 
       implicit none
       ! Arguments
-      class(rmvs_tp),                     intent(inout) :: self        !! RMVS massive body object
-      class(swiftest_body),               intent(inout) :: inserts     !!  Inserted object 
-      logical, dimension(:),              intent(in)    :: lfill_list !! Logical array of bodies to merge into the keeps
+      class(rmvs_tp),        intent(inout) :: self       !! RMVS test particle object
+      class(swiftest_body),  intent(inout) :: inserts    !! Inserted object 
+      logical, dimension(:), intent(in)    :: lfill_list !! Logical array of bodies to merge into the keeps
 
       associate(keeps => self)
          select type(inserts)
@@ -73,11 +73,11 @@ module subroutine rmvs_util_spill_pl(self, discards, lspill_list)
       !! Adapted from David E. Kaufmann's Swifter routine discard_discard_spill.f90
       implicit none
       ! Arguments
-      class(rmvs_pl),        intent(inout) :: self      !! Swiftest massive body body object
+      class(rmvs_pl),        intent(inout) :: self        !! RMVS massive body body object
       class(swiftest_body),  intent(inout) :: discards    !! Discarded object 
       logical, dimension(:), intent(in)    :: lspill_list !! Logical array of bodies to spill into the discards
       ! Internals
-      integer(I4B)                                         :: i
+      integer(I4B) :: i
 
       associate(keeps => self)
          select type(discards)
@@ -104,11 +104,11 @@ module subroutine rmvs_util_spill_tp(self, discards, lspill_list)
       !! Adapted from David E. Kaufmann's Swifter routine whm_discard_spill.f90
       implicit none
       ! Arguments
-      class(rmvs_tp),                        intent(inout) :: self       !! RMVS test particle object
-      class(swiftest_body),                  intent(inout) :: discards    !! Discarded object 
-      logical, dimension(:),                 intent(in)    :: lspill_list !! Logical array of bodies to spill into the discards
+      class(rmvs_tp),        intent(inout) :: self        !! RMVS test particle object
+      class(swiftest_body),  intent(inout) :: discards    !! Discarded object 
+      logical, dimension(:), intent(in)    :: lspill_list !! Logical array of bodies to spill into the discards
       ! Internals
-      integer(I4B)                                         :: i
+      integer(I4B) :: i
 
       associate(keeps => self)
          select type(discards)