Got rid of more streams. Made more things Iterable instead of Iterator