Place loop refactor