Modernize to range-based loop