diff --git a/src/grid/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90
index aa9e705a6..1ff356cb9 100644
--- a/src/grid/grid_mech_FEM.f90
+++ b/src/grid/grid_mech_FEM.f90
@@ -190,11 +190,11 @@ subroutine grid_mechanical_FEM_init
   CHKERRQ(ierr)
   call DMSNESSetJacobianLocal(mechanical_grid,formJacobian,PETSC_NULL_SNES,ierr)
   CHKERRQ(ierr)
-  call SNESSetConvergenceTest(mechanical_snes,converged,PETSC_NULL_SNES,PETSC_NULL_FUNCTION,ierr)         ! specify custom convergence check function "_converged"
+  call SNESSetConvergenceTest(mechanical_snes,converged,PETSC_NULL_SNES,PETSC_NULL_FUNCTION,ierr)   ! specify custom convergence check function "_converged"
   CHKERRQ(ierr)
-  call SNESSetMaxLinearSolveFailures(mechanical_snes, huge(1), ierr)                                      ! ignore linear solve failures
+  call SNESSetMaxLinearSolveFailures(mechanical_snes, huge(1), ierr)                                ! ignore linear solve failures
   CHKERRQ(ierr)
-  call SNESSetFromOptions(mechanical_snes,ierr)                                                           ! pull it all together with additional cli arguments
+  call SNESSetFromOptions(mechanical_snes,ierr)                                                     ! pull it all together with additional cli arguments
   CHKERRQ(ierr)
 
 !--------------------------------------------------------------------------------------------------
@@ -489,10 +489,8 @@ subroutine converged(snes_local,PETScIter,devNull1,devNull2,fnorm,reason,dummy,i
   divTol = max(maxval(abs(P_av))*num%eps_div_rtol   ,num%eps_div_atol)
   BCTol  = max(maxval(abs(P_av))*num%eps_stress_rtol,num%eps_stress_atol)
 
-  if (terminallyIll .or. &
-      (totalIter >= num%itmin .and. &
-       all([ err_div/divTol, &
-             err_BC /BCTol   ] < 1.0_pReal))) then
+  if ((totalIter >= num%itmin .and. all([err_div/divTol, err_BC/BCTol] < 1.0_pReal)) &
+       .or. terminallyIll) then
     reason = 1
   elseif (totalIter >= num%itmax) then
     reason = -1
diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90
index c8896e2eb..ba435300a 100644
--- a/src/grid/grid_mech_spectral_basic.f90
+++ b/src/grid/grid_mech_spectral_basic.f90
@@ -424,10 +424,8 @@ subroutine converged(snes_local,PETScIter,devNull1,devNull2,devNull3,reason,dumm
   divTol = max(maxval(abs(P_av))*num%eps_div_rtol   ,num%eps_div_atol)
   BCTol  = max(maxval(abs(P_av))*num%eps_stress_rtol,num%eps_stress_atol)
 
-  if ((totalIter >= num%itmin .and. &
-                            all([ err_div/divTol, &
-                                  err_BC /BCTol       ] < 1.0_pReal)) &
-              .or.    terminallyIll) then
+  if ((totalIter >= num%itmin .and. all([err_div/divTol, err_BC/BCTol] < 1.0_pReal)) &
+       .or. terminallyIll) then
     reason = 1
   elseif (totalIter >= num%itmax) then
     reason = -1
diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90
index 5c26fc85c..388588743 100644
--- a/src/grid/grid_mech_spectral_polarisation.f90
+++ b/src/grid/grid_mech_spectral_polarisation.f90
@@ -483,11 +483,8 @@ subroutine converged(snes_local,PETScIter,devNull1,devNull2,devNull3,reason,dumm
   divTol     = max(maxval(abs(P_av))         *num%eps_div_rtol   ,num%eps_div_atol)
   BCTol      = max(maxval(abs(P_av))         *num%eps_stress_rtol,num%eps_stress_atol)
 
-  if (terminallyIll .or. &
-      (totalIter >= num%itmin .and. &
-       all([ err_div /divTol, &
-             err_curl/curlTol, &
-             err_BC  /BCTol   ] < 1.0_pReal))) then
+  if ((totalIter >= num%itmin .and. all([err_div/divTol, err_curl/curlTol, err_BC/BCTol] < 1.0_pReal)) &
+       .or. terminallyIll) then
     reason = 1
   elseif (totalIter >= num%itmax) then
     reason = -1