Merge "Use foreach for readability"