refactor: Side-effect free utils
#3322
+47
−46
Merged
utils
#3322