using const_iterator now where possible