Merge "Refactor to use the utils class." into main