Cleanup another 2 loops