Try to start moving back to range-based for