Started cleaning up multidimensional iterating