Move return out of for loops (whoops)