refactor( for less complexity when reading)
#135

Ipuch wants to merge climatechange into main

We do not currently have an analysis of these two commits