Use each instead of each_with_object (And no nests now!)