Some improvements like implementing Iterator in collection

As you requested...