Remove return inside loop