diff --git a/R/Calibration.GRiwrmInputsModel.R b/R/Calibration.GRiwrmInputsModel.R
index e341f6e956184c1a9b8ce28b0409178989cb7d6c..9d65235cb4eccb33aaddca27864fb9db39216bf8 100644
--- a/R/Calibration.GRiwrmInputsModel.R
+++ b/R/Calibration.GRiwrmInputsModel.R
@@ -34,7 +34,7 @@ Calibration.GRiwrmInputsModel <- function(InputsModel,
   b <- sapply(InputsModel, function(IM) !IM$isUngauged)
   gaugedIds <- names(b[b])
 
-  for(id in gaugedIds) {
+  for (id in gaugedIds) {
     IM <- InputsModel[[id]]
     message("Calibration.GRiwrmInputsModel: Processing sub-basin ", id, "...")
 
diff --git a/R/CreateCalibOptions.GRiwrmInputsModel.R b/R/CreateCalibOptions.GRiwrmInputsModel.R
index 8d06d706da31f21c159308696824e74af281292a..7367dfe646b3e54644eed1cccaf01fffc6542dc8 100644
--- a/R/CreateCalibOptions.GRiwrmInputsModel.R
+++ b/R/CreateCalibOptions.GRiwrmInputsModel.R
@@ -43,7 +43,7 @@ CreateCalibOptions.GRiwrmInputsModel <- function(x, FixedParam = NULL, ...) {
   CalibOptions <- list()
   class(CalibOptions) <- c("GRiwrmCalibOptions", class(CalibOptions))
 
-  for(id in gaugedIds) {
+  for (id in gaugedIds) {
     IM <- x[[id]]
     FP <- NULL
     if (!is.null(FixedParam)) {
diff --git a/R/CreateInputsCrit.GRiwrmInputsModel.R b/R/CreateInputsCrit.GRiwrmInputsModel.R
index f78a11c5105eb34c5ba3e4a3f12485386f3163eb..e161a15dd6ac25dca01e9bdd56e10cc50f8db355 100644
--- a/R/CreateInputsCrit.GRiwrmInputsModel.R
+++ b/R/CreateInputsCrit.GRiwrmInputsModel.R
@@ -74,7 +74,7 @@ CreateInputsCrit.GRiwrmInputsModel <- function(InputsModel,
 
   np <- getAllNodesProperties(attr(InputsModel, "GRiwrm"))
   gaugedIds <- np$id[np$calibration == "Gauged"]
-  for(id in gaugedIds) {
+  for (id in gaugedIds) {
     if (id %in% colnames(Obs)) {
       IM <- InputsModel[[id]]
       InputsCrit[[IM$id]] <- CreateInputsCrit.InputsModel(
diff --git a/R/CreateInputsModel.GRiwrm.R b/R/CreateInputsModel.GRiwrm.R
index 32b0575c96fa6cdc346407b42695c73b6cb82766..818f7a08a76620a4a5262c03d12e4182a636f2b4 100644
--- a/R/CreateInputsModel.GRiwrm.R
+++ b/R/CreateInputsModel.GRiwrm.R
@@ -175,7 +175,7 @@ CreateInputsModel.GRiwrm <- function(x, DatesR,
 
   InputsModel <- CreateEmptyGRiwrmInputsModel(x)
 
-  for(id in getNodeRanking(x)) {
+  for (id in getNodeRanking(x)) {
     message("CreateInputsModel.GRiwrm: Processing sub-basin ", id, "...")
 
     InputsModel[[id]] <-
diff --git a/R/CreateRunOptions.GRiwrmInputsModel.R b/R/CreateRunOptions.GRiwrmInputsModel.R
index 7b49faeab85ac0d216c7f85612644705449ef0e8..8bc88b9b2450b222eee899286ab9ec2bcfd39438 100644
--- a/R/CreateRunOptions.GRiwrmInputsModel.R
+++ b/R/CreateRunOptions.GRiwrmInputsModel.R
@@ -6,7 +6,7 @@ CreateRunOptions.GRiwrmInputsModel <- function(x, IniStates = NULL, ...) {
   RunOptions <- list()
   class(RunOptions) <- append(class(RunOptions), "GRiwrmRunOptions")
 
-  for(id in names(x)) {
+  for (id in names(x)) {
     RunOptions[[id]] <- CreateRunOptions(x[[id]], IniStates = IniStates[[id]], ...)
     RunOptions[[id]]$id <- id
   }
diff --git a/R/RunModel.GRiwrmInputsModel.R b/R/RunModel.GRiwrmInputsModel.R
index 308c51ce0604611708a0f6a16129b043a7c54fb0..6fd9b6d0fdb271ab938720009651e21d7fec0a30 100644
--- a/R/RunModel.GRiwrmInputsModel.R
+++ b/R/RunModel.GRiwrmInputsModel.R
@@ -15,7 +15,7 @@ RunModel.GRiwrmInputsModel <- function(x, RunOptions, Param, ...) {
   OutputsModel <- list()
   class(OutputsModel) <- c("GRiwrmOutputsModel", class(OutputsModel))
 
-  for(id in names(x)) {
+  for (id in names(x)) {
     message("RunModel.GRiwrmInputsModel: Processing sub-basin ", x[[id]]$id, "...")
 
     # Update x[[id]]$Qupstream with simulated upstream flows
diff --git a/R/RunModel.Supervisor.R b/R/RunModel.Supervisor.R
index e2c2e01bf7f64b1af2ec18a26d1ad5ed6bb7ac7d..a29c2e93c3028229ef96382b3c18848d42bc913e 100644
--- a/R/RunModel.Supervisor.R
+++ b/R/RunModel.Supervisor.R
@@ -44,13 +44,13 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
   class(x$OutputsModel) <- c("GRiwrmOutputsModel", class(x$OutputsModel))
 
   # Copy simulated pure runoff flows (no SD nor Diversion nodes) to Qupstream
-  for(id in getNoSD_Ids(x$InputsModel, include_diversion = FALSE)) {
+  for (id in getNoSD_Ids(x$InputsModel, include_diversion = FALSE)) {
     updateQupstream.Supervisor(x, id, IndPeriod_Run)
   }
 
   # Initialization of model states by running the model with no supervision on warm-up period
   RunOptionsWarmUp <- RunOptions
-  for(id in names(x$InputsModel)) {
+  for (id in names(x$InputsModel)) {
     RunOptionsWarmUp[[id]]$IndPeriod_Run <- RunOptionsWarmUp[[id]]$IndPeriod_WarmUp
     RunOptionsWarmUp[[id]]$IndPeriod_WarmUp <- 0L
     RunOptionsWarmUp[[id]]$Outputs_Sim <- c("StateEnd", "Qsim")
@@ -64,7 +64,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
   # Adapt RunOptions to step by step simulation and copy states
   SD_Ids <- getSD_Ids(x$InputsModel, add_diversions = TRUE)
   names(SD_Ids) <- SD_Ids
-  for(id in SD_Ids) {
+  for (id in SD_Ids) {
     RunOptions[[id]]$IndPeriod_WarmUp <- 0L
     RunOptions[[id]]$Outputs_Sim <- c("Qsim_m3", "StateEnd")
     x$OutputsModel[[id]]$StateEnd <- serializeIniStates(OM_WarmUp[[id]]$StateEnd)
@@ -88,7 +88,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
   iProgressSteps <- round(length(lSuperTS) * seq(0.1, 0.9, 0.1))
 
   # Loop over time steps with a step equal to the supervision time step
-  for(i in seq_along(lSuperTS)) {
+  for (i in seq_along(lSuperTS)) {
     iProgressMessage <- which(i == iProgressSteps)
     if (length(iProgressMessage) == 1) {
       message(" ", 10 * iProgressMessage, "%", appendLF = FALSE)
@@ -102,7 +102,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
       doSupervision(x)
     }
     # Loop over sub-basin using SD model
-    for(id in SD_Ids) {
+    for (id in SD_Ids) {
       # Run model for the sub-basin and one time step
       RunOptions[[id]]$IniStates <- serializeIniStates(x$OutputsModel[[id]]$StateEnd)
       RunOptions[[id]]$IndPeriod_Run <- iTS
@@ -136,7 +136,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
 
   message(" 100%")
 
-  for(id in SD_Ids) {
+  for (id in SD_Ids) {
     x$OutputsModel[[id]]$DatesR <- x$DatesR[IndPeriod_Run]
     for (outputVar in outputVars[[id]]) {
       x$OutputsModel[[id]][[outputVar]] <- x$storedOutputs[[outputVar]][, id]
diff --git a/R/RunModel_Reservoir.R b/R/RunModel_Reservoir.R
index 02e620a4e098ba6d86367c2bc85a1bed1f7f34d5..8cbc6c786ea0fb355a63513088ad2737fb3f4776 100644
--- a/R/RunModel_Reservoir.R
+++ b/R/RunModel_Reservoir.R
@@ -73,7 +73,7 @@ RunModel_Reservoir <- function(InputsModel, RunOptions, Param) {
   }
 
   # Time series volume and release calculation
-  for(i in iPerTot) {
+  for (i in iPerTot) {
     Vsim[i] <- V0 + Qinflows_m3[i]
     if (InputsModel$hasDiversion) {
       Qdiv_m3[i] <- min(Vsim[i] + InputsModel$Qmin[IndPerTot[i]], InputsModel$Qdiv[IndPerTot[i]])
diff --git a/R/UpdateQsimUpstream.R b/R/UpdateQsimUpstream.R
index 9d0a012a2b4af6697babb3ddb838b9b2eb3eabd9..80148499ec3db3f10e09845305ef69007c41c6a6 100644
--- a/R/UpdateQsimUpstream.R
+++ b/R/UpdateQsimUpstream.R
@@ -12,7 +12,7 @@
 #'
 UpdateQsimUpstream <- function(InputsModel, Runoptions, OutputsModel) {
   iQ <- which(InputsModel$UpstreamIsModeled)
-  for(i in iQ) {
+  for (i in iQ) {
     InputsModel$Qupstream[Runoptions$IndPeriod_Run, i] <- OutputsModel[[InputsModel$UpstreamNodes[i]]][[InputsModel$UpstreamVarQ[i]]]
     varWarmupQ_m3 <- paste0("WarmUp", InputsModel$UpstreamVarQ[i])
     if (!is.null(OutputsModel[[InputsModel$UpstreamNodes[i]]]$RunOptions[[varWarmupQ_m3]])) {
diff --git a/R/utils.CreateInputsModel.R b/R/utils.CreateInputsModel.R
index c5a4ab9481327ec8df388d96361540e45ea50f34..f473014d4d1c14cc4af43dbb63f65f823b0ab077 100644
--- a/R/utils.CreateInputsModel.R
+++ b/R/utils.CreateInputsModel.R
@@ -2,7 +2,7 @@ updateQObsQrelease <- function(g, Qobs, Qrelease) {
   reservoirIds <- g$id[!is.na(g$model) & g$model == "RunModel_Reservoir"]
   # Fill Qrelease with Qobs
   warn_ids <- NULL
-  for(id in reservoirIds) {
+  for (id in reservoirIds) {
     if (!id %in% colnames(Qrelease)) {
       if (id %in% colnames(Qobs)) {
         if (!any(g$id == id & (!is.na(g$model) & g$model == "Diversion"))) {
diff --git a/tests/testthat/helper_1_RunModel.R b/tests/testthat/helper_1_RunModel.R
index 73c12db354cda99ec1f150683a63b935bc82a503..07ae1a53ed0e69cff32824f7caf1a3ecb5a43574 100644
--- a/tests/testthat/helper_1_RunModel.R
+++ b/tests/testthat/helper_1_RunModel.R
@@ -8,7 +8,7 @@
 #' e <- setupRunModel()
 # variables are copied from environment 'e' to the current environment
 # https://stackoverflow.com/questions/9965577/r-copy-move-one-environment-to-another
-#' for(x in ls(e)) assign(x, get(x, e))
+#' for (x in ls(e)) assign(x, get(x, e))
 #'
 setupRunModel <-
   function(runInputsModel = TRUE,
diff --git a/tests/testthat/helper_Calibration.R b/tests/testthat/helper_Calibration.R
index 63ed941664de80ec0929522cd682cc5182e09a42..e4dba204170b2aab5b8afb9f2a4481c0a87041fd 100644
--- a/tests/testthat/helper_Calibration.R
+++ b/tests/testthat/helper_Calibration.R
@@ -16,7 +16,7 @@ runCalibration <- function(nodes = NULL,
                      runRunModel = runRunModel,
                      Qobs2 = Qobs2,
                      IsHyst = IsHyst)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   rm(e)
   np <- getAllNodesProperties(griwrm)
 
diff --git a/tests/testthat/helper_RunModel_Reservoir.R b/tests/testthat/helper_RunModel_Reservoir.R
index 48a8167df7815fd1a9e76cefa82aad1d7c3aa5f0..45bd3c7b4e2b80e3de3ac1f3d0f01d9230ce6175 100644
--- a/tests/testthat/helper_RunModel_Reservoir.R
+++ b/tests/testthat/helper_RunModel_Reservoir.R
@@ -69,7 +69,7 @@ testDerivedUngauged <- function(donorByDerivation) {
   CalibOptions <- CreateCalibOptions(InputsModel,
                                      FixedParam = list(Dam = c(650E6, 1)))
   e <- runCalibration(g, Qobs2 = Qobs2, CalibOptions = CalibOptions)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_equal(Param[["54095"]][1:3],
                Param[[ifelse(donorByDerivation, "54029", "54001")]][2:4])
 }
diff --git a/tests/testthat/test-CreateInputsModel.R b/tests/testthat/test-CreateInputsModel.R
index fa6acf9d2a2575f7ebcadebd14c8e00929b125f4..9c67fd18f2a16dcf1bde88cd36cc5c4b56f7ba22 100644
--- a/tests/testthat/test-CreateInputsModel.R
+++ b/tests/testthat/test-CreateInputsModel.R
@@ -266,7 +266,7 @@ test_that("Node with upstream nodes having area = NA should return correct Basin
     Dam = rep(0,11536)
   )
   e <- setupRunModel(griwrm = g, runInputsModel = FALSE, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   InputsModel <-
     suppressWarnings(CreateInputsModel(g, DatesR, Precip, PotEvap, Qobs = Qobs2))
   expect_equal(sum(InputsModel$`54001`$BasinAreas),
@@ -276,7 +276,7 @@ test_that("Node with upstream nodes having area = NA should return correct Basin
 test_that("Use of Qobs for Qrelease should raise a warning",  {
   g <- CreateGRiwrm(n_rsrvr)
   e <- setupRunModel(griwrm = g, runInputsModel = FALSE)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_warning(CreateInputsModel(griwrm, DatesR, Precip, PotEvap,
                                    TempMean = TempMean,
                                    Qobs = Qobs_rsrvr))
diff --git a/tests/testthat/test-RunModel.R b/tests/testthat/test-RunModel.R
index 644ea0b637ccf18ea37827b4d32baf6956bf6dcf..cdd1d675d49ed37dc2b1070d4f88653e07745120 100644
--- a/tests/testthat/test-RunModel.R
+++ b/tests/testthat/test-RunModel.R
@@ -236,7 +236,7 @@ test_that("A transparent upstream node with area=NA should return same result #1
   )
   g <- CreateGRiwrm(nodes)
   e <- setupRunModel(griwrm = g, runRunModel = FALSE)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   Param <- ParamMichel[c("54095", "54001")]
   Param[["P"]] <- 1
   OM <- RunModel(InputsModel,
@@ -258,7 +258,7 @@ test_that("RunModel should return water deficit (Qover_m3)", {
   g <- CreateGRiwrm(nodes)
   Qobs2 <- data.frame(P = rep(-2E6, length(DatesR)))
   expect_warning(e <- setupRunModel(griwrm = g, runRunModel = TRUE, Qobs2 = Qobs2))
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_false(any(OM_GriwrmInputs$`54001`$Qsim_m3 < 0))
   expect_true(all(OM_GriwrmInputs$`54001`$Qover_m3 >= 0))
   sv <- CreateSupervisor(InputsModel)
diff --git a/tests/testthat/test-RunModel.Supervisor.R b/tests/testthat/test-RunModel.Supervisor.R
index 8f8675cb8d24d8e3aeb4fc63e3dd5a8b21b029a7..06916956a4dff5410ef601f26ac6def968e0056f 100644
--- a/tests/testthat/test-RunModel.Supervisor.R
+++ b/tests/testthat/test-RunModel.Supervisor.R
@@ -94,7 +94,7 @@ test_that("RunModel.Supervisor with diversion node should not produce NAs", {
   Qobs2 <- matrix(data = rep(0, length(DatesR)), ncol = 1)
   colnames(Qobs2) <- "54001"
   e <- setupRunModel(griwrm = g_div, runRunModel = FALSE, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   sv <- CreateSupervisor(InputsModel, TimeStep = 1L)
   logicFunFactory <- function(sv) {
     #' @param Y Flow measured at "54002" the previous time step
diff --git a/tests/testthat/test-RunModel_Ungauged.R b/tests/testthat/test-RunModel_Ungauged.R
index 7ee25b3865e7534298030854f5e59d95d60b3032..4d8d88c802f6c78d859e5611b1eb1008e6f23259 100644
--- a/tests/testthat/test-RunModel_Ungauged.R
+++ b/tests/testthat/test-RunModel_Ungauged.R
@@ -8,7 +8,7 @@ test_that("RunModel_Ungauged should act as RunModel", {
   nodes$model[nodes$id == "54095"] <- "Ungauged"
   g <- CreateGRiwrm(nodes)
   e <- setupRunModel(runRunModel = FALSE, griwrm = g)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
 
   Param <- ParamMichel["54001"]
   Param[["54095"]] <-
@@ -65,7 +65,7 @@ test_that("RunModel_Ungauged works with a diversion as donor (#110)", {
   Qobs2 <- matrix(0, ncol = 1, nrow = 11536)
   colnames(Qobs2) <- "54032"
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   OCdiv <- OutputsCalib
   expect_equal(OCdiv, OC)
 })
@@ -101,7 +101,7 @@ test_that("RunModel_Ungauged works with a diversion as upstream node (#113)", {
   Qobs2 <- matrix(0, ncol = 1, nrow = 11536)
   colnames(Qobs2) <- "54095"
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_equal(OutputsCalib$`54032`$CritFinal, CritValue)
 })
 
@@ -111,7 +111,7 @@ test_that("RunModel_Ungauged works with a diversion as upstream node (#113)", {
   Qobs2 <- matrix(0, ncol = 1, nrow = 11536)
   colnames(Qobs2) <- "54095"
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_equal(OutputsCalib$`54032`$CritFinal, CritValue)
 })
 
@@ -123,7 +123,7 @@ test_that("Ungauged node with diversion outside the sub-network should work", {
 
   # First without Diversion
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   OC1 <- OutputsCalib
   Param1 <- Param
   OM1 <- RunModel(
@@ -146,7 +146,7 @@ test_that("Ungauged node with diversion outside the sub-network should work", {
   Qobs2 <- matrix(0, ncol = 1, nrow = 11536)
   colnames(Qobs2) <- "54095"
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   OC2 <- OutputsCalib
   expect_equal(OC2$`54001`$CritFinal, OC1$`54001`$CritFinal)
   expect_equal(OC2$`54032`$CritFinal, OC1$`54032`$CritFinal)
@@ -184,7 +184,7 @@ test_that("Ungauged node with upstream node with diversion should work", {
   Qobs2 <- matrix(0, ncol = length(g$id[g$model == "Diversion"]), nrow = 11536)
   colnames(Qobs2) <- g$id[g$model == "Diversion"]
   e <- setupRunModel(griwrm = g, runRunModel = FALSE, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
 
   ParamRef[["P"]] <- 1
   OM <- RunModel(InputsModel,
@@ -230,7 +230,7 @@ test_that("Donor node with diversion should work", {
   Qobs2 <- matrix(0, ncol = length(g$id[g$model == "Diversion"]), nrow = 11536)
   colnames(Qobs2) <- g$id[g$model == "Diversion"]
   e <- runCalibration(nodes, Qobs2 = Qobs2)
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_equal(OC_ref$`54032`$CritFinal, OutputsCalib$`54032`$CritFinal, tolerance = 1E-3)
 })
 
@@ -261,7 +261,7 @@ test_that("Cemaneige with hysteresis works",  {
   e <- suppressWarnings(
     setupRunModel(griwrm = griwrm, runRunModel = FALSE, IsHyst = TRUE)
   )
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
 
   expect_true(all(sapply(InputsModel, function(x) x$model$hasX4)))
 
@@ -285,7 +285,7 @@ test_that("Cemaneige with hysteresis works",  {
   e <- suppressWarnings(
     runCalibration(nodes, InputsCrit = InputsCrit, CalibOptions = CO, IsHyst = TRUE)
   )
-  for(x in ls(e)) assign(x, get(x, e))
+  for (x in ls(e)) assign(x, get(x, e))
   expect_equal(sapply(Param, length),
                c("54057" = 9, "54032" = 9, "54001" = 8))
 })