Cleaned up the lazy iterators a bit