Minor clean up and a bit more description for the various iterator types