continue replacing Generator with Iterator everywhere possible (may have missed a few places still)