Cleanup helper function.  Remove iterator and use 'each' method