diff --git a/cgyro/src/cgyro_mpi_grid.F90 b/cgyro/src/cgyro_mpi_grid.F90
index c37c55e7d..6aec8baaf 100644
--- a/cgyro/src/cgyro_mpi_grid.F90
+++ b/cgyro/src/cgyro_mpi_grid.F90
@@ -16,8 +16,7 @@ subroutine cgyro_mpi_grid
 
   implicit none
 
-  integer :: ie,ix,is,ir,it
-  integer :: iexch,itm,j
+  integer :: ie,ix,is,ir,it,itm
   integer :: iltheta_min,iltheta_max
   integer :: d
   integer :: splitkey
diff --git a/cgyro/src/cgyro_upwind.F90 b/cgyro/src/cgyro_upwind.F90
index f99f0d5fc..623c09506 100644
--- a/cgyro/src/cgyro_upwind.F90
+++ b/cgyro/src/cgyro_upwind.F90
@@ -23,7 +23,7 @@ subroutine cgyro_upwind_prepare_async_r64
 
   implicit none
 
-  integer :: is,ie,itor
+  integer :: is,itor
   complex :: res_loc
   complex :: g_val
 
@@ -121,7 +121,7 @@ subroutine cgyro_upwind_prepare_async_r32
 
   implicit none
 
-  integer :: is,ie,itor
+  integer :: is,itor
   complex(KIND=REAL32) :: res_loc
   complex :: g_val
 
diff --git a/cgyro/src/cgyro_write_initdata.f90 b/cgyro/src/cgyro_write_initdata.f90
index a69ff8c78..8d9050da8 100644
--- a/cgyro/src/cgyro_write_initdata.f90
+++ b/cgyro/src/cgyro_write_initdata.f90
@@ -312,11 +312,13 @@ end subroutine cgyro_write_initdata
 
 subroutine prime_factors(n,pout)
 
+  implicit none
+  
   integer, intent(in) :: n
   character(len=50), intent(inout) :: pout
   character(len=50) :: warn
   integer, dimension(27) :: pvec,cvec
-  integer :: ptmp
+  integer :: i,ptmp
   character(len=4) :: fmt
   character(len=3) :: s1,s2