diff --git a/Src/F_Interfaces/AmrCore/AMReX_FlashFluxRegister.cpp b/Src/F_Interfaces/AmrCore/AMReX_FlashFluxRegister.cpp
index 8f5a04dfc39..abe74c41125 100644
--- a/Src/F_Interfaces/AmrCore/AMReX_FlashFluxRegister.cpp
+++ b/Src/F_Interfaces/AmrCore/AMReX_FlashFluxRegister.cpp
@@ -68,7 +68,7 @@ void FlashFluxRegister::define (const BoxArray& fba, const BoxArray& cba,
                 bl[dir].push_back(amrex::coarsen(amrex::bdryNode(ccbx,face.first),
                                                  ref_ratio));
                 procmap[dir].push_back(fdm[i]);
-                if (fdm[i] == myproc) my_global_indices[dir].push_back(i);
+                if (fdm[i] == myproc) { my_global_indices[dir].push_back(i); }
             }
         }
 
@@ -140,7 +140,7 @@ void FlashFluxRegister::define (const BoxArray& fba, const BoxArray& cba,
                 const int dir = face.coordDir();
                 bl[dir].push_back(amrex::bdryNode(ccbx,face));
                 procmap[dir].push_back(cdm[i]);
-                if (cdm[i] == myproc) my_global_indices[dir].push_back(i);
+                if (cdm[i] == myproc) { my_global_indices[dir].push_back(i); }
             }
         }
 
diff --git a/Src/F_Interfaces/AmrCore/AMReX_fluxregister_fi.cpp b/Src/F_Interfaces/AmrCore/AMReX_fluxregister_fi.cpp
index edbc3970bad..2ce6399a695 100644
--- a/Src/F_Interfaces/AmrCore/AMReX_fluxregister_fi.cpp
+++ b/Src/F_Interfaces/AmrCore/AMReX_fluxregister_fi.cpp
@@ -31,8 +31,9 @@ extern "C"
         bx.shiftHalf(dir,-1);
 
         BL_ASSERT(flux_reg->nComp() == nfluxes);
-        if (zeroFirst)
+        if (zeroFirst) {
           flux_reg->FineSetVal(dir, boxno, 0, flux_reg->nComp(), 0.0, RunOn::Cpu);
+        }
         const FArrayBox fab(bx, nfluxes, const_cast<Real*>(fabdata));
         flux_reg->FineAdd(fab, dir, boxno, 0, 0, flux_reg->nComp(), scale, RunOn::Cpu);
     }
diff --git a/Src/F_Interfaces/Base/AMReX_distromap_fi.cpp b/Src/F_Interfaces/Base/AMReX_distromap_fi.cpp
index 66d744cde5c..e50031a5887 100644
--- a/Src/F_Interfaces/Base/AMReX_distromap_fi.cpp
+++ b/Src/F_Interfaces/Base/AMReX_distromap_fi.cpp
@@ -32,8 +32,9 @@ extern "C" {
     {
         Long dmsize = dm->size();
         AMREX_ASSERT(plen >= dmsize);
-        for (int i = 0; i < dmsize && i < plen; ++i)
+        for (int i = 0; i < dmsize && i < plen; ++i) {
             pmap[i] = (*dm)[i];
+        }
     }
 
     void amrex_fi_print_distromap (const DistributionMapping* dm)
diff --git a/Src/F_Interfaces/Base/AMReX_geometry_fi.cpp b/Src/F_Interfaces/Base/AMReX_geometry_fi.cpp
index d50f22c2220..bafc9d0f5e0 100644
--- a/Src/F_Interfaces/Base/AMReX_geometry_fi.cpp
+++ b/Src/F_Interfaces/Base/AMReX_geometry_fi.cpp
@@ -19,8 +19,9 @@ extern "C"
     void amrex_fi_geometry_get_pmask (int is_per[3])
     {
         Geometry* gg = AMReX::top()->getDefaultGeometry();
-        for (int i = 0; i < BL_SPACEDIM; ++i)
+        for (int i = 0; i < BL_SPACEDIM; ++i) {
             is_per[i] = gg->isPeriodic(i);
+        }
     }
 
     void amrex_fi_geometry_get_probdomain (Real problo[3], Real probhi[3])
diff --git a/Src/F_Interfaces/LinearSolvers/AMReX_abeclaplacian_fi.cpp b/Src/F_Interfaces/LinearSolvers/AMReX_abeclaplacian_fi.cpp
index 673192dd84b..010951c60f8 100644
--- a/Src/F_Interfaces/LinearSolvers/AMReX_abeclaplacian_fi.cpp
+++ b/Src/F_Interfaces/LinearSolvers/AMReX_abeclaplacian_fi.cpp
@@ -11,9 +11,9 @@ extern "C" {
                                      int max_coarsening_level)
     {
         LPInfo info;
-        if (metric_term >= 0) info.setMetricTerm(metric_term);
-        if (agglomeration >= 0) info.setAgglomeration(agglomeration);
-        if (consolidation >= 0) info.setConsolidation(consolidation);
+        if (metric_term >= 0)   { info.setMetricTerm(metric_term); }
+        if (agglomeration >= 0) { info.setAgglomeration(agglomeration); }
+        if (consolidation >= 0) { info.setConsolidation(consolidation); }
         info.setMaxCoarseningLevel(max_coarsening_level);
         Vector<Geometry> g;
         Vector<BoxArray> b;
diff --git a/Src/F_Interfaces/LinearSolvers/AMReX_poisson_fi.cpp b/Src/F_Interfaces/LinearSolvers/AMReX_poisson_fi.cpp
index 54351a33864..4680451022a 100644
--- a/Src/F_Interfaces/LinearSolvers/AMReX_poisson_fi.cpp
+++ b/Src/F_Interfaces/LinearSolvers/AMReX_poisson_fi.cpp
@@ -11,9 +11,9 @@ extern "C" {
                                int max_coarsening_level)
     {
         LPInfo info;
-        if (metric_term >= 0) info.setMetricTerm(metric_term);
-        if (agglomeration >= 0) info.setAgglomeration(agglomeration);
-        if (consolidation >= 0) info.setConsolidation(consolidation);
+        if (metric_term   >= 0) { info.setMetricTerm(metric_term); }
+        if (agglomeration >= 0) { info.setAgglomeration(agglomeration); }
+        if (consolidation >= 0) { info.setConsolidation(consolidation); }
         info.setMaxCoarseningLevel(max_coarsening_level);
         Vector<Geometry> g;
         Vector<BoxArray> b;