diff --git a/src/geometry.F90 b/src/geometry.F90
index 2731f77d43..2a67619ad1 100644
--- a/src/geometry.F90
+++ b/src/geometry.F90
@@ -1616,8 +1616,8 @@ contains
     integer, intent(inout) :: goal             ! target universe ID
     integer, intent(inout) :: map              ! map index in vector of maps
     type(Universe), intent(in) :: univ         ! universe searching in
-    integer, intent(inout)     :: counts(:,:)  ! Target count
-    logical, intent(inout)     :: found(:,:)   ! Target found
+    integer, intent(inout)     :: counts(:,:)  ! target count
+    logical, intent(inout)     :: found(:,:)   ! target found
 
     integer :: i                          ! index over cells
     integer :: j, k, m                    ! indices in lattice
@@ -1715,8 +1715,8 @@ contains
   recursive function count_target(univ, counts, found, goal, map) result(count)
 
     type(Universe), intent(inout) :: univ         ! universe to search through
-    integer, intent(inout)        :: counts(:,:)  ! Target count
-    logical, intent(inout)        :: found(:,:)   ! Target found
+    integer, intent(inout)        :: counts(:,:)  ! target count
+    logical, intent(inout)        :: found(:,:)   ! target found
     integer, intent(inout)        :: goal         ! target universe ID
     integer, intent(inout)        :: map          ! current map
 
diff --git a/src/geometry_header.F90 b/src/geometry_header.F90
index c05d46583a..9e1f1d06ce 100644
--- a/src/geometry_header.F90
+++ b/src/geometry_header.F90
@@ -28,7 +28,6 @@ module geometry_header
     integer              :: outside          ! Material to fill area outside
     integer              :: outer            ! universe to tile outside the lat
     logical              :: is_3d            ! Lattice has cells on z axis
-    integer :: level                         ! Level of lattice
     integer, allocatable :: offset(:,:,:,:)  ! Distribcell offsets
     
     contains
diff --git a/src/initialize.F90 b/src/initialize.F90
index 11224e30b5..4c3cc8147d 100644
--- a/src/initialize.F90
+++ b/src/initialize.F90
@@ -1050,7 +1050,6 @@ contains
       do j = 1, univ % n_cells
         if (cell_list % contains(univ % cells(j))) then
           n_maps = n_maps + 1
-          cycle
         end if
       end do
     end do
@@ -1064,13 +1063,8 @@ contains
     ! Allocate list to track if target distribcells are found in each universe
     allocate(found(n_universes, n_maps))
 
-    do i = 1, n_universes
-      do j = 1, n_maps
-        counts(i,j) = 0
-        found(i,j) = .false.
-      end do
-    end do
-
+    counts(:,:) = 0
+    found(:,:) = .false.
     k = 1
 
     do i = 1, n_universes