diff --git a/src/error.f90 b/src/error.f90
index ddeb6007b1..73e23c386b 100644
--- a/src/error.f90
+++ b/src/error.f90
@@ -19,8 +19,8 @@ contains
 
   subroutine warning()
 
-    integer :: n_lines
-    integer :: i
+    integer :: n_lines ! number of lines
+    integer :: i       ! loop index for lines
 
     ! Only allow master to print to screen
     if (.not. master) return
@@ -46,8 +46,8 @@ contains
 
   subroutine fatal_error()
 
-    integer :: n_lines
-    integer :: i
+    integer :: n_lines ! number of lines
+    integer :: i       ! loop index over lines
 
     ! Only allow master to print to screen
     if (master) then
diff --git a/src/fileio.f90 b/src/fileio.f90
index 001da2c177..96a7f83c8b 100644
--- a/src/fileio.f90
+++ b/src/fileio.f90
@@ -89,8 +89,8 @@ contains
     integer, intent(in)  :: n_lines ! number of lines to skip
     integer, intent(out) :: ioError ! error status 
 
-    integer                 :: i        ! index for number of lines
-    character(MAX_LINE_LEN) :: tmp      ! single line
+    integer                 :: i   ! index for number of lines
+    character(MAX_LINE_LEN) :: tmp ! single line
 
     do i = 1, n_lines
        read(UNIT=unit, FMT='(A)', IOSTAT=ioError) tmp
@@ -110,8 +110,8 @@ contains
     integer, intent(in)  :: lines          ! total number of lines
     integer, intent(in)  :: words_per_line ! number of words per line
 
-    integer :: i       ! line index
-    integer :: loc     ! locator for array
+    integer :: i   ! line index
+    integer :: loc ! locator for array
 
     loc = 0
     do i = 1, lines
@@ -137,8 +137,8 @@ contains
     integer, intent(in)  :: lines          ! total number of lines
     integer, intent(in)  :: words_per_line ! number of words per line
 
-    integer :: i       ! line index
-    integer :: loc     ! locator for array
+    integer :: i   ! line index
+    integer :: loc ! locator for array
 
     loc = 0
     do i = 1, lines
diff --git a/src/fission.f90 b/src/fission.f90
index 75612a7757..c544385361 100644
--- a/src/fission.f90
+++ b/src/fission.f90
@@ -22,9 +22,9 @@ contains
     real(8), intent(in)    :: E   ! energy of incoming neutron
     real(8)                :: nu  ! number of total neutrons emitted per fission
 
-    integer :: i           ! loop index
-    integer :: NC          ! number of polynomial coefficients
-    real(8) :: c           ! polynomial coefficient
+    integer :: i  ! loop index
+    integer :: NC ! number of polynomial coefficients
+    real(8) :: c  ! polynomial coefficient
 
     if (nuc % nu_t_type == NU_NONE) then
        message = "No neutron emission data for table: " // nuc % name
@@ -57,9 +57,9 @@ contains
     real(8), intent(in)    :: E   ! energy of incoming neutron
     real(8)                :: nu  ! number of prompt neutrons emitted per fission
 
-    integer :: i           ! loop index
-    integer :: NC          ! number of polynomial coefficients
-    real(8) :: c           ! polynomial coefficient
+    integer :: i  ! loop index
+    integer :: NC ! number of polynomial coefficients
+    real(8) :: c  ! polynomial coefficient
 
     if (nuc % nu_p_type == NU_NONE) then
        ! since no prompt or delayed data is present, this means all neutron
diff --git a/src/geometry.f90 b/src/geometry.f90
index fbde7b4a4f..cf83b08e09 100644
--- a/src/geometry.f90
+++ b/src/geometry.f90
@@ -99,9 +99,8 @@ contains
     integer                 :: x, y
     type(Cell),     pointer :: c          ! pointer to cell
     type(Lattice),  pointer :: lat        ! pointer to lattice
-    type(Universe), pointer :: lower_univ ! if particle is in lower
-                                          ! universe, use this pointer
-                                          ! to call recursively
+    type(Universe), pointer :: lower_univ ! if particle is in lower universe,
+                                          ! use this pointer to call recursively
 
     found = .false.