Added Iterable, some cleanup.