Replace current for loops with STL iterators

[LiamSkirrow]

Using actual iterators from the templates themselves is probably better practice, should probably go in and make the replacement eventually.