Refactoring - convert to for.
Add more.